diff --git a/package.json b/package.json
index 8ebba1aa..7b18e615 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "start": "electron dist",
     "watch": "gulp watch",
     "serve": "gulp watch",
-    "test": "gulp build && mocha --reporter mocha-circleci-reporter --recursive test/specs && gulp prettify:verify",
+    "test": "npm run build && mocha --reporter mocha-circleci-reporter --recursive test/specs && gulp prettify:verify",
     "package:all": "npm run package:windows && npm run package:mac && npm run package:linux",
     "package:windows": "build --win --x64 --ia32 --em.name=mattermost && npm run manipulate-windows-zip",
     "package:mac": "build --mac --x64 --ia32",
@@ -40,6 +40,7 @@
     "babel-preset-react": "^6.5.0",
     "chai": "^3.5.0",
     "chai-as-promised": "^5.3.0",
+    "cross-env": "^3.1.2",
     "devtron": "^1.3.0",
     "electron-builder": "^7.11.2",
     "electron-connect": "~0.6.0",
@@ -55,7 +56,8 @@
     "mocha-circleci-reporter": "0.0.2",
     "spectron": "~3.4.0",
     "through2": "^2.0.1",
-    "webpack": "^1.13.1"
+    "webpack": "^1.13.1",
+    "webpack-merge": "^0.14.1"
   },
   "build": {
     "appId": "com.mattermost.desktop",
diff --git a/webpack.config.base.js b/webpack.config.base.js
new file mode 100644
index 00000000..4f8cd192
--- /dev/null
+++ b/webpack.config.base.js
@@ -0,0 +1,7 @@
+'use strict';
+
+const isProduction = process.env.NODE_ENV === 'production';
+
+module.exports = {
+  devtool: isProduction ? false : '#inline-source-map'
+};
diff --git a/webpack.config.main.js b/webpack.config.main.js
index 4f84c646..01d98fd5 100644
--- a/webpack.config.main.js
+++ b/webpack.config.main.js
@@ -1,4 +1,9 @@
-module.exports = {
+'use strict';
+
+const merge = require('webpack-merge');
+const base = require('./webpack.config.base');
+
+module.exports = merge(base, {
   entry: './src/main.js',
   output: {
     filename: './dist/main.js'
@@ -17,4 +22,4 @@ module.exports = {
   externals: {
     remote: true // for electron-connect
   }
-};
+});
diff --git a/webpack.config.renderer.js b/webpack.config.renderer.js
index 8cf21e21..d3062719 100644
--- a/webpack.config.renderer.js
+++ b/webpack.config.renderer.js
@@ -1,4 +1,9 @@
-module.exports = {
+'use strict';
+
+const merge = require('webpack-merge');
+const base = require('./webpack.config.base');
+
+module.exports = merge(base, {
   entry: {
     index: './src/browser/index.jsx',
     settings: './src/browser/settings.jsx',
@@ -25,4 +30,4 @@ module.exports = {
     __dirname: false
   },
   target: 'electron-renderer'
-};
+});