diff --git a/Gruntfile.js b/Gruntfile.js
index 81dd7d7..8bf07c2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -103,7 +103,7 @@
         },
         files: {
             srcBlob: '<%= dirs.src %>/**/*.js',
-            testBlob: '<%= dirs.test %>/{functional,lib/pixi,unit/pixi}/**/*.js',
+            testBlob: '<%= dirs.test %>/**/*.js',
             testConf: '<%= dirs.test %>/karma.conf.js',
             build: '<%= dirs.build %>/pixi.dev.js',
             buildMin: '<%= dirs.build %>/pixi.js'
@@ -132,13 +132,16 @@
             options: {
                 jshintrc: './.jshintrc'
             },
-            source: srcFiles.filter(function(v) { return v.match(/(Intro|Outro|Spine|Pixi)\.js$/) === null; }).concat('Gruntfile.js'),
-            test: {
-                src: [
-                    '<%= files.testBlob %>',
-                    '<%= files.testConf %>'
-                ],
+            source: {
+                src: srcFiles.concat('Gruntfile.js'),
                 options: {
+                    ignores: '<%= dirs.src %>/**/{Intro,Outro,Spine,Pixi}.js'
+                }
+            },
+            test: {
+                src: ['<%= files.testBlob %>'],
+                options: {
+                    ignores: '<%= dirs.test %>/lib/resemble.js',
                     jshintrc: undefined, //don't use jshintrc for tests
                     expr: true,
                     undef: false,