diff --git a/Gruntfile.js b/Gruntfile.js
index d5842ab..e8761ac 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,16 +4,19 @@ module.exports = function(grunt) {
     jshint: {
       files: ['Gruntfile.js', 'lib/**/*.js']
     },
-    shell: {
-        runMocha: {
-            command: 'mocha'
-        }
+    mochaTest: {
+      test: {
+        options: {
+          reporter: 'spec',
+        },
+        src: ['test/**/*.js']
+      }
     }
   });
 
   grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-shell');
+  grunt.loadNpmTasks('grunt-mocha-test');
 
-  grunt.registerTask('default', ['jshint', 'shell']);
+  grunt.registerTask('default', ['jshint', 'mochaTest']);
 
 };
\ No newline at end of file
diff --git a/package.json b/package.json
index c6caf48..971c164 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "chai": "^3.0.0",
     "grunt": "^0.4.5",
     "grunt-contrib-jshint": "^0.11.2",
-    "grunt-shell": "^1.1.2",
+    "grunt-mocha-test": "^0.12.7",
     "nock": "^2.3.0",
     "node-uuid": "^1.4.3"
   }