diff --git a/services/chat/docker-compose.ci.yml b/services/chat/docker-compose.ci.yml
index bc5398bd83..0ba28ed4e3 100644
--- a/services/chat/docker-compose.ci.yml
+++ b/services/chat/docker-compose.ci.yml
@@ -11,7 +11,7 @@ services:
     volumes:
       - .:/app
     working_dir: /app
-    entrypoint: npm run test:unit:run
+    entrypoint: npm run test:unit:_run
 
   test_acceptance:
     image: node:4.2.1
@@ -24,7 +24,7 @@ services:
     depends_on:
       - redis
       - mongo
-    entrypoint: npm run test:acceptance:run
+    entrypoint: npm run test:acceptance:_run
 
   redis:
     image: redis
diff --git a/services/chat/package.json b/services/chat/package.json
index f7db817ad8..2f0eac6f9f 100644
--- a/services/chat/package.json
+++ b/services/chat/package.json
@@ -9,14 +9,14 @@
   "scripts": {
     "compile:app": "coffee -o app/js -c app/coffee && coffee -c app.coffee",
     "start": "npm run compile:app && node app.js",
-    "test:acceptance:run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
-    "test:acceptance": "npm run compile:app && npm run compile:acceptance_tests && npm run test:acceptance:run -- $@",
-    "test:unit:run": "mocha --recursive --reporter spec $@ test/unit/js",
-    "test:unit": "npm run compile:app && npm run compile:unit_tests && npm run test:unit:run -- $@",
+    "test:acceptance": "npm run compile:app && npm run compile:acceptance_tests && npm run test:acceptance:_run -- $@",
+    "test:unit": "npm run compile:app && npm run compile:unit_tests && npm run test:unit:_run -- $@",
     "compile:unit_tests": "[ -e test/unit ] && coffee -o test/unit/js -c test/unit/coffee || echo 'No unit tests to compile'",
     "compile:acceptance_tests": "[ -e test/acceptance ] && coffee -o test/acceptance/js -c test/acceptance/coffee || echo 'No acceptance tests to compile'",
     "compile:all": "npm run compile:app && npm run compile:unit_tests && npm run compile:acceptance_tests",
-    "nodemon": "nodemon --config nodemon.json"
+    "nodemon": "nodemon --config nodemon.json",
+    "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
+    "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js"
   },
   "dependencies": {
     "async": "0.2.9",
diff --git a/services/chat/test/acceptance/scripts/full-test.sh b/services/chat/test/acceptance/scripts/full-test.sh
deleted file mode 100755
index 13620ba41e..0000000000
--- a/services/chat/test/acceptance/scripts/full-test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env bash
-
-# npm rebuild
-
-sleep 60
-
-echo ">> Starting server..."
-
-grunt --no-color forever:app:start
-
-echo ">> Server started"
-
-sleep 5
-
-echo ">> Running acceptance tests..."
-grunt --no-color mochaTest:acceptance
-_test_exit_code=$?
-
-echo ">> Killing server"
-
-grunt --no-color forever:app:stop
-
-echo ">> Done"
-
-exit $_test_exit_code