diff --git a/.jscsrc b/.jscsrc
index ac17b5dc9c..7229391def 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,3 +1,5 @@
 {
-    "preset": "crockford"
+    "preset": "crockford",
+    "requireMultipleVarDecl": false,
+    "requireVarDeclFirst": false
 }
diff --git a/.jshintrc b/.jshintrc
index df3f02a1ff..ca549530ff 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -5,7 +5,7 @@
     "eqeqeq": true,
     "forin": true,
     "freeze": true,
-    "funcscope": true,
+    "funcscope": false,
     "futurehostile": true,
     "latedef": true,
     "noarg": true,
@@ -16,6 +16,7 @@
         "define",
         "Promise"
     ],
+    "shadow": "inner",
     "strict": "implied",
     "undef": true,
     "unused": "vars"
diff --git a/gulpfile.js b/gulpfile.js
index 28d4530b9c..c3e82295d6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -147,6 +147,6 @@ gulp.task('develop', ['serve', 'stylesheets', 'watch']);
 
 gulp.task('install', [ 'static', 'scripts' ]);
 
-gulp.task('verify', [ 'lint', 'test' ]);
+gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);
 
 gulp.task('build', [ 'verify', 'install' ]);