diff --git a/Makefile b/Makefile
index 1816f24e..fb3589bc 100644
--- a/Makefile
+++ b/Makefile
@@ -6,3 +6,14 @@ clean:
 
 check:
 	npm test
+
+test:
+	test/run_tests.sh ${RUNTESTFLAGS} test/unit/*.js test/unit/model/*.js test/acceptance/*.js  test/acceptance/export/*.js
+
+test-unit:
+	test/run_tests.sh ${RUNTESTFLAGS} test/unit/*.js test/unit/model/*.js
+
+test-acceptance:
+	test/run_tests.sh ${RUNTESTFLAGS} test/acceptance/*.js  test/acceptance/export/*.js
+
+.PHONY: test
diff --git a/package.json b/package.json
index c8504d32..3711ab2a 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
         "libxmljs": "~0.8.1"
     },
     "scripts": {
-        "test": "test/run_tests.sh ${RUNTESTFLAGS} test/unit/*.js test/unit/model/*.js test/acceptance/*.js  test/acceptance/export/*.js"
+        "test": "make test"
     },
     "engines": {
         "node": ">=0.8 <0.11",