diff --git a/Makefile b/Makefile
index 9f3862ad3b285715e91cbe88500a80fe60f3fb6c..b8ce6aacb5378d9f0fc16e59406ba95f4150ad38 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 build: node_modules/ bower_components/
 
 test: node_modules/ build lint
-	node ./node_modules/.bin/node-qunit-phantomjs ./test/test.html
+	./test/run.sh
 
 lint: node_modules/
 	./node_modules/.bin/jshint *.js test/*.js
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e6011a561bab464394f4f8e0a80b2ad6c66264b4
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1 @@
+server.pid
diff --git a/test/run.sh b/test/run.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f366974f34051669eb4e8452aea9818d57af7b20
--- /dev/null
+++ b/test/run.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+function stop() {
+  kill -9 $(<test/server.pid)
+  rm test/server.pid
+}
+trap stop EXIT
+
+node ./test/server.js & echo "$!" > test/server.pid
+
+node ./node_modules/.bin/node-qunit-phantomjs http://localhost:3000/test/test.html