diff --git a/.travis.yml b/.travis.yml
index 7edd7c20b0..67d8a994d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ node_js:
 services:
   - mongodb
 before_script:
-  - 'npm install -g grunt-cli'
+  - 'npm install -g grunt-cli mocha'
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - cp config.json.example config.json
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7407b2ece5..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-compile:
-	./node_modules/coffee-script/bin/coffee -bw -o ./lib -c ./src
-
-MOCHA_TESTS := $(shell find test/ -name '*.mocha.*')
-MOCHA = mocha --compilers coffee:coffee-script
-OUT_FILE = "test-output.tmp"
-
-g = "."
-
-test-mocha:
-	@NODE_ENV=test $(MOCHA) --grep "$(g)" $(MOCHA_TESTS)
-	#@NODE_ENV=test $(MOCHA) --grep "$(g)" $(MOCHA_TESTS) | tee $(OUT_FILE)
-
-test-casper:
-	casperjs test ./test/rest.casper.coffee
-
-test!:
-	@perl -n -e '/\[31m  0\) (.*?).\[0m/ && print "make test g=\"$$1\$$\""' $(OUT_FILE) | sh
diff --git a/test/mocha.opts b/test/mocha.opts
index 96d67d9dc1..48e0516929 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,7 +1,6 @@
 --colors
 --reporter spec
 --timeout 4000
---ignore-leaks
 --growl
 --debug
 --compilers coffee:coffee-script
diff --git a/test/run_tests.sh b/test/run_tests.sh
index d9f588ea06..5530b716fa 100755
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -17,4 +17,4 @@ NODE_PID=$!
 trap "kill $NODE_PID && curl http://localhost:4444/selenium-server/driver/?cmd=shutDownSeleniumServer" EXIT
 
 sleep 3 # Wait for Selenium
-grunt karma:continuous && ./node_modules/protractor/bin/protractor protractor.conf.js
+mocha && grunt karma:continuous && ./node_modules/protractor/bin/protractor protractor.conf.js