diff --git a/.jshintrc b/.jshintrc
index d34c42da5..e79eeee47 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -6,7 +6,6 @@
 	"expr": true,
 	"immed": true,
 	"noarg": true,
-	"onevar": true,
 	"quotmark": "double",
 	"smarttabs": true,
 	"trailing": true,
diff --git a/Gruntfile.js b/Gruntfile.js
index c4acdb7fc..7ccb800b0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -201,6 +201,15 @@ grunt.initConfig({
 				requireSpacesInsideParentheses: null
 			},
 			src: [ "Gruntfile.js", "build/tasks/*.js" ]
+		},
+		demos: {
+			options: {
+
+				// While the style guide removed onevar upgrading jscs to allow it causes too many
+				// errors right now
+				disallowMultipleVarDecl: null
+			},
+			src: "demos/**/*.js"
 		}
 	},
 	uglify: minify,
@@ -249,7 +258,8 @@ grunt.initConfig({
 			"Gruntfile.js",
 			"build/**/*.js",
 			"tests/unit/**/*.js",
-			"tests/lib/**/*.js"
+			"tests/lib/**/*.js",
+			"demos/**/*.js"
 		]
 	},
 	csslint: {