diff --git a/package.json b/package.json
index 6b90dc4c8..521cbe1ec 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "grunt": "0.4.5",
     "grunt-cli": "0.1.13",
     "grunt-compare-size": "0.4.0",
-    "grunt-contrib-jshint": "0.10.0",
+    "grunt-contrib-jshint": "0.11.2",
     "grunt-contrib-uglify": "0.7.0",
     "grunt-contrib-watch": "0.6.1",
     "grunt-git-authors": "2.0.1",
diff --git a/src/.jshintrc b/src/.jshintrc
index 2de9e9c8d..d0445ba77 100644
--- a/src/.jshintrc
+++ b/src/.jshintrc
@@ -17,6 +17,7 @@
 	"wsh": true,
 
 	"globals": {
+		"JSON": false,
 		"jQuery": true,
 		"define": false,
 		"module": false,
diff --git a/test/.jshintrc b/test/.jshintrc
index c25fe832e..f345337a1 100644
--- a/test/.jshintrc
+++ b/test/.jshintrc
@@ -22,6 +22,8 @@
 		"require": false,
 		"define": false,
 		"DOMParser": false,
+		"JSON": false,
+		"Promise": false,
 		"QUnit": false,
 		"ok": false,
 		"equal": false,