diff --git a/.jshintrc b/.jshintrc
index 129152f27b..1651444347 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,7 +1,6 @@
 {
       "node": true,
       "browser": false,
-      "nomen": false,
       "strict": false,
       "sub": true,
       "eqeqeq": true,
@@ -19,9 +18,6 @@
       "regexp": true,
       "undef": true,
       "unused": true,
-      "trailing": true,
       "indent": 4,
-      "onevar": true,
-      "white": true,
       "predef": [ "-Promise" ]
 }
diff --git a/core/client/.jshintrc b/core/client/.jshintrc
index b5215d7b9e..4a0855de14 100644
--- a/core/client/.jshintrc
+++ b/core/client/.jshintrc
@@ -1,7 +1,6 @@
 {
     "node": false,
     "browser": true,
-    "nomen": false,
     "bitwise": true,
     "curly": true,
     "eqeqeq": true,
@@ -16,11 +15,8 @@
     "regexp": true,
     "undef": true,
     "unused": true,
-    "trailing": true,
     "indent": 4,
     "esnext": true,
-    "onevar": true,
-    "white": true,
     "quotmark": "single",
     "globals": {
         "Ember": true,
@@ -32,5 +28,6 @@
         "ic": true,
         "NProgress": true,
         "moment": true
-    }
+    },
+    "predef": ["-Notification"]
 }
diff --git a/core/test/.jshintrc b/core/test/.jshintrc
index bcc496e6c6..236977d63c 100644
--- a/core/test/.jshintrc
+++ b/core/test/.jshintrc
@@ -1,7 +1,6 @@
 {
       "node": true,
       "browser": true,
-      "nomen": false,
       "strict": false,
       "sub": true,
       "eqeqeq": true,
@@ -19,10 +18,7 @@
       "regexp": true,
       "undef": true,
       "unused": true,
-      "trailing": true,
       "indent": 4,
-      "onevar": true,
-      "white": true,
       "quotmark": "single",
       "predef": [ "-Promise" ]
 }
diff --git a/package.json b/package.json
index 93cbcdc3fd..39ba6b5b39 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
         "grunt-contrib-compress": "~0.11.0",
         "grunt-contrib-concat": "~0.5.0",
         "grunt-contrib-copy": "~0.5.0",
-        "grunt-contrib-jshint": "~0.10.0",
+        "grunt-contrib-jshint": "~0.11.0",
         "grunt-contrib-uglify": "~0.6.0",
         "grunt-contrib-watch": "~0.6.1",
         "grunt-docker": "~0.0.8",