diff --git a/package.json b/package.json
index 25728f9d70..f8a5394de4 100644
--- a/package.json
+++ b/package.json
@@ -19,11 +19,14 @@
     "lint-utils": "jsonlint -q server/utils/*.json",
     "lint-js": "eslint --ext=.js,.jsx server/ common/ config/ client/",
     "lint-json": "npm run lint-server && npm run lint-challenges && npm run lint-resources && npm run lint-utils",
-    "test-challenges": "babel-node seed/test-challenges.js | tap-spec",
+    "test-challenges": "npm run test-challenges",
     "pretest": "npm run lint",
-    "test": "npm run test-challenges",
     "snyk-protect": "snyk protect",
-    "prepublish": "npm run snyk-protect"
+    "prepublish": "npm run snyk-protect",
+    "test-js": "tape -r babel-register 'common/**/*.test.js'",
+    "test": "npm run test-js && npm run test-challenges",
+    "cover": "babel-node ./node_modules/.bin/babel-istanbul cover tape common/**/*.test.js",
+    "coveralls": "npm run cover && istanbul-coveralls"
   },
   "license": "(BSD-3-Clause AND CC-BY-SA-4.0)",
   "dependencies": {
@@ -118,6 +121,7 @@
     "babel-cli": "^6.3.17",
     "babel-core": "^6.3.26",
     "babel-eslint": "^6.1.2",
+    "babel-istanbul": "^0.11.0",
     "babel-loader": "^6.2.1",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-preset-es2015": "^6.3.13",
@@ -147,6 +151,7 @@
     "gulp-uglify": "^1.5.1",
     "gulp-util": "^3.0.6",
     "happy": "0.0.1",
+    "istanbul-coveralls": "^1.0.3",
     "json-loader": "~0.5.2",
     "jsonlint": "^1.6.2",
     "less": "^2.5.1",