diff --git a/grunt-config/jshint.js b/grunt-config/jshint.js
index 561a2e2..8a2c798 100644
--- a/grunt-config/jshint.js
+++ b/grunt-config/jshint.js
@@ -2,8 +2,10 @@ module.exports = {
     options: {
         reporter: require('jshint-stylish')
     },
-    work: [
-        '<%= paths.frontend_js %>/*.js',
+    frontend_js: [
+        '<%= paths.frontend_js %>'
+    ],
+    toolchain: [
         'Gruntfile.js'
     ]
 };
diff --git a/grunt-config/watch.js b/grunt-config/watch.js
index be0d0d1..fa6ff18 100644
--- a/grunt-config/watch.js
+++ b/grunt-config/watch.js
@@ -1,6 +1,6 @@
 module.exports = {
     js: {
         files: '<%= paths.frontend_js %>',
-        tasks: ['concat:frontend_js']
+        tasks: ['jshint:frontend_js', 'concat:frontend_js']
     }
 };