diff --git a/package.json b/package.json
index 594c31a7..970b325c 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     "merge-stream": "^1.0.1",
     "node-pty": "^0.7.2",
     "nodemon": "1.10.2",
+    "npm-run-all": "^4.1.2",
     "sorcery": "^0.10.0",
     "tslint": "^5.9.1",
     "typescript": "~2.7.1",
@@ -79,7 +80,8 @@
     "prestart-zmodem": "npm run build",
     "start-zmodem": "node build/addons/zmodem/demo/app",
     "lint": "tslint src/*.ts src/**/*.ts",
-    "test": "gulp test",
+    "test": "npm-run-all mocha lint",
+    "mocha": "gulp test",
     "build:docs": "jsdoc -c jsdoc.json",
     "tsc": "tsc",
     "build": "gulp build",