diff --git a/package.json b/package.json
index b95a16e06..03ed8a04f 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
     "build-watch": "WEBPACK=TRUE NODE_ENV=development webpack --progress --config webpack.config.js --watch",
     "lint": "eslint --ext=.js --ext=.json bin/* .",
     "lint-fix": "yarn lint --fix",
-    "test": "TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
-    "test-jest": "TEST_MODE=unit NODE_ENV=test jest",
+    "jest-watch": "TEST_MODE=unit NODE_ENV=test jest --watch",
+    "test": "TEST_MODE=unit NODE_ENV=test jest && TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
     "test-cover": "TEST_MODE=unit NODE_ENV=test istanbul cover _mocha --report text --check-coverage -- -R spec",
     "heroku-postbuild": "./bin/cli plugins reconcile && yarn build",
     "generate-introspection": "WEBPACK=TRUE NODE_ENV=test ./scripts/generateIntrospectionResult.js"