diff --git a/Gruntfile.js b/Gruntfile.js
index f92d1ed..4e08c54 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -3,40 +3,18 @@ module.exports = function (grunt) {
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'), // the package file to use
         eslint: {
-            target: ['script']
-        },
-        jshint: {
-            options: {
-                curly: true,
-                forin: true,
-                freeze: true,
-                globals: {
-                    DOKU_BASE: false,
-                    LANG: false,
-                    initToolbar: false
-                },
-                strict: true,
-                undef: true,
-                unused: true,
-                plusplus: true,
-                browser: true,
-                devel: true,
-                jquery: true,
-                qunit: true
-            },
-            all: ['_jstest/*.js', 'script/*.js', '!script/handsontable.full.js']
+            target: ['script', '_jstest']
         },
         qunit: {
             all: ['_jstest/*.html']
         },
         watch: {
             files: ['_jstest/*.js', '_jstest/*.html', 'script/*.js'],
-            tasks: ['qunit', 'jshint']
+            tasks: ['qunit', 'eslint']
         }
     });
     grunt.loadNpmTasks('grunt-contrib-qunit');
     grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-eslint');
     grunt.registerTask('default', ['qunit']);
 };
diff --git a/package.json b/package.json
index 8f70e47..9f588e2 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
     "eslint": "^4.5.0",
     "eslint-plugin-compat": "^1.0.4",
     "grunt": "^0.4.5",
-    "grunt-contrib-jshint": "^1.0.0",
     "grunt-contrib-qunit": "^0.7.0",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-eslint": "^20.0.0",