diff --git a/Gruntfile.js b/Gruntfile.js
index 21404b2..c5b2184 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -96,12 +96,16 @@ module.exports = function(grunt) {
             dev: {
                 singleRun: false,
                 browsers: ['PhantomJS']
+            },
+            'dev-single': {
+                singleRun: true,
+                browsers: ['PhantomJS']
             }
         }
     });
 
     // load all grunt tasks
-    require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
+    require('matchdep').filterDev(['grunt-*', '!grunt-cli']).forEach(grunt.loadNpmTasks);
 
     grunt.registerTask('forever', function() {
         this.async();
@@ -109,12 +113,15 @@ module.exports = function(grunt) {
 
     var devJobs = ['eslint', 'babel', 'uglify', 'clean', 'jade'];
     var testJobs = devJobs.concat('connect');
-    if (saucekey !== null && !process.env.TRAVIS_PULL_REQUEST) {
+    if (saucekey && !process.env.TRAVIS_PULL_REQUEST) {
+        console.info('adding saucelabs integration');
         testJobs.push('saucelabs-mocha');
     }
 
     if (process.env.TRAVIS_JOB_ID) {
         testJobs = testJobs.concat('karma:ci');
+    } else {
+        testJobs.push('karma:dev-single');
     }
 
     grunt.registerTask('dev', devJobs);
diff --git a/package.json b/package.json
index 8e6e66e..60867ee 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "karma": "^0.13.21",
     "karma-mocha": "^0.2.2",
     "karma-phantomjs-launcher": "^1.0.0",
-    "matchdep": "~0.1.2",
+    "matchdep": "^1.0.1",
     "mocha": "^2.4.5",
     "phantomjs-prebuilt": "^2.1.4"
   },