diff --git a/package.json b/package.json
index c2e18882..5658d8d6 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "chai": "^3.5.0",
     "commander": "^2.8.0",
     "cors": "^2.7.1",
+    "cross-env": "^3.1.4",
     "express": "^4.13.3",
     "istanbul": "^0.4.3",
     "jscs": "^3.0.0",
@@ -54,12 +55,31 @@
     "jsonld"
   ],
   "scripts": {
-    "test-local": "make test-local",
-    "test-node": "make test-node",
-    "test-browser": "make test-browser",
-    "test": "make test",
-    "coverage": "make test-coverage",
-    "coverage-report": "make test-coverage-report",
+    "test-suite-node": "mocha -t 30000 -A -R spec tests/test.js",
+    "test-suite-browser": "phantomjs tests/test.js",
+
+    "test-node": "cross-env JSONLD_TEST_SUITE=../json-ld.org/test-suite && npm run test-suite-node",
+    "test-browser": "cross-env JSONLD_TEST_SUITE=../json-ld.org/test-suite && npm run test-suite-browser ",
+
+    "test-local-node": "cross-env JSONLD_TEST_SUITE=./tests/new-embed-api && npm run test-suite-node",
+    "test-local-browser": "cross-env JSONLD_TEST_SUITE=./tests/new-embed-api && npm run test-suite-browser",
+
+    "test-normalization-node": "cross-env JSONLD_TEST_SUITE=../normalization/tests && npm run test-suite-node",
+    "test-normalization-browser": "cross-env JSONLD_TEST_SUITE=../normalization/tests && npm run test-suite-browser",
+
+    "test-coverage": "istanbul cover _mocha -- -t 30000 -u exports -R spec tests/test.js",
+    "test-coverage-lcov": "istanbul cover _mocha --report lcovonly -- -t 30000 -u exports -R spec tests/test.js",
+    "test-coverage-report": "istanbul report",
+
+    "test-local": "mocha -t 30000 -R spec tests/test.js",
+
+    "clean": "rm -rf coverage",
+
+    "test": "npm run test-local && npm run test-node && npm run test-browser && npm run test-local-node && npm run test-local-browser && npm run test-normalization-node && npm run test-normalization-browser",
+
+    "coverage": "npm run test-coverage",
+    "coverage-report": "npm run test-coverage-report",
+
     "jscs": "jscs js/jsonld.js tests/*.js",
     "jshint": "jshint js/jsonld.js tests/*.js"
   },
diff --git a/tests/test.js b/tests/test.js
index 06ba4c8b..4fe90b79 100644
--- a/tests/test.js
+++ b/tests/test.js
@@ -85,7 +85,8 @@ if(_nodejs) {
 
   mocha.setup({
     reporter: 'spec',
-    ui: 'bdd'
+    ui: 'bdd',
+    useColors: true
   });
 }
 
@@ -616,11 +617,20 @@ function joinPath() {
     null, Array.prototype.slice.call(arguments));
 }
 
+function fsSeparator() {
+  // if the fs.separator isn't in the workingDirectory path, then we're likely
+  // in bash on Windows (mingw)
+  if (fs.workingDirectory.lastIndexOf(fs.separator) === -1) {
+    return '/';
+  }
+  return fs.separator;
+}
+
 function dirname(filename) {
   if(_nodejs) {
     return path.dirname(filename);
   }
-  var idx = filename.lastIndexOf(fs.separator);
+  var idx = filename.lastIndexOf(fsSeparator());
   if(idx === -1) {
     return filename;
   }
@@ -631,7 +641,7 @@ function basename(filename) {
   if(_nodejs) {
     return path.basename(filename);
   }
-  var idx = filename.lastIndexOf(fs.separator);
+  var idx = filename.lastIndexOf(fsSeparator());
   if(idx === -1) {
     return filename;
   }