diff --git a/package.json b/package.json
index 7fbe9c62..09fa3640 100644
--- a/package.json
+++ b/package.json
@@ -24,12 +24,12 @@
     "watch:main": "node scripts/watch_main_and_preload.js",
     "watch:renderer": "webpack-dev-server --config webpack.config.renderer.js",
     "serve": "gulp watch",
-    "test": "npm-run-all build test:* lint:*",
-    "test:app": "mocha --reporter mocha-circleci-reporter --recursive test/specs",
+    "test": "npm-run-all test:* lint:*",
+    "test:app": "npm run build && mocha --reporter mocha-circleci-reporter --recursive test/specs",
     "package:all": "npm-run-all package:windows package:mac package:linux",
-    "package:windows": "build --win --x64 --ia32 --em.name=mattermost --publish=never && npm run manipulate-windows-zip",
-    "package:mac": "build --mac --publish=never",
-    "package:linux": "build --linux --x64 --ia32 --em.name=mattermost-desktop --publish=never",
+    "package:windows": "npm run build && build --win --x64 --ia32 --em.name=mattermost --publish=never && npm run manipulate-windows-zip",
+    "package:mac": "npm run build && build --mac --publish=never",
+    "package:linux": "npm run build && build --linux --x64 --ia32 --em.name=mattermost-desktop --publish=never",
     "manipulate-windows-zip": "node scripts/manipulate_windows_zip.js",
     "lint:js": "eslint --ext .js --ext .jsx ."
   },