diff --git a/services/web/Makefile b/services/web/Makefile
index e9c796b6a0..3f137a87c7 100644
--- a/services/web/Makefile
+++ b/services/web/Makefile
@@ -181,8 +181,9 @@ test: test_unit test_frontend test_acceptance
 test_unit:
 	npm -q run test:unit -- ${MOCHA_ARGS}
 
-test_frontend:
-	npm -q run test:frontend -- ${MOCHA_ARGS}
+test_frontend: test_clean # stop service
+	$(MAKE) compile
+	docker-compose ${DOCKER_COMPOSE_FLAGS} up test_frontend
 
 test_acceptance: test_acceptance_app test_acceptance_modules
 
diff --git a/services/web/bin/frontend_test b/services/web/bin/frontend_test
deleted file mode 100755
index 599055803a..0000000000
--- a/services/web/bin/frontend_test
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e;
-MOCHA="node_modules/.bin/mocha --recursive --reporter spec"
-$MOCHA "$@" test/unit_frontend/js
-
diff --git a/services/web/package.json b/services/web/package.json
index 0a6cdbd854..38c1891e0e 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -15,8 +15,7 @@
     "test:acceptance:dir": "npm -q run test:acceptance:wait_for_app && npm -q run test:acceptance:run -- $@",
     "test:acceptance": "npm -q run test:acceptance:dir -- $@ test/acceptance/js",
     "test:unit": "npm -q run compile && bin/unit_test $@",
-    "test:frontend": "npm -q run compile && bin/frontend_test $@",
-    "test:karma": "npm -q run compile && karma start --single-run",
+    "test:frontend": "karma start --single-run",
     "compile": "make compile",
     "start": "npm -q run compile && node app.js",
     "nodemon": "nodemon --config nodemon.json",