diff --git a/gruntfile.js b/gruntfile.js
index 4fd102e..153f40c 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -49,12 +49,9 @@ module.exports = function(grunt) {
       }
     },
 
-    mocha: {
-      test: {
-        options: {
-          log: true,
-          urls: [ 'http://127.0.0.1:9001/tests/index.html' ]
-        }
+    shell: {
+      mocha: {
+        command: './node_modules/.bin/mocha --reporter list --no-exit tests/node-runner.js'
       }
     },
 
@@ -90,13 +87,12 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-requirejs');
   grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-mocha');
-  grunt.loadNpmTasks('grunt-contrib-connect');
+  grunt.loadNpmTasks('grunt-shell');
 
   grunt.registerTask('develop', ['clean', 'requirejs']);
   grunt.registerTask('release', ['develop', 'uglify']);
   grunt.registerTask('check', ['jshint']);
-  grunt.registerTask('test', ['check', 'connect', 'mocha']);
+  grunt.registerTask('test', ['check', 'shell:mocha']);
 
   grunt.registerTask('default', ['develop']);
 };
diff --git a/package.json b/package.json
index 2223364..da487f0 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "grunt-contrib-connect": "~0.1.2",
     "grunt-contrib-concat": "~0.1.3",
     "grunt-contrib-jshint": "~0.7.1",
+    "grunt-shell": "~0.7.0",
     "grunt-mocha": "0.4.10",
     "requirejs": "~2.1.11",
     "mocha": "~1.18.2",