diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index a0109fbce7..0000000000
--- a/.jshintrc
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "bitwise": true,
-    "curly": true,
-    "eqeqeq": true,
-    "freeze": true,
-    "funcscope": true,
-    "futurehostile": true,
-    "latedef": true,
-    "noarg": true,
-    "nocomma": true,
-    "nonbsp": true,
-    "nonew": true,
-    "predef": [
-        "define",
-        "Blob",
-        "Float32Array",
-        "Promise"
-    ],
-    "strict": "implied",
-    "undef": true,
-    "unused": true
-}
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index d96d0ad825..1fab6d5b18 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -56,6 +56,28 @@ var gulp = require('gulp'),
             mainConfigFile: paths.main,
             wrapShim: true
         },
+        jshint: {
+            "bitwise": true,
+            "curly": true,
+            "eqeqeq": true,
+            "freeze": true,
+            "funcscope": true,
+            "futurehostile": true,
+            "latedef": true,
+            "noarg": true,
+            "nocomma": true,
+            "nonbsp": true,
+            "nonew": true,
+            "predef": [
+                "define",
+                "Blob",
+                "Float32Array",
+                "Promise"
+            ],
+            "strict": "implied",
+            "undef": true,
+            "unused": true
+        },
         karma: {
             configFile: path.resolve(__dirname, 'karma.conf.js'),
             singleRun: true
@@ -103,7 +125,7 @@ gulp.task('lint', function () {
         return "!" + glob;
     });
     return gulp.src(paths.scripts.concat(nonspecs))
-        .pipe(jshint())
+        .pipe(jshint(options.jshint))
         .pipe(jshint.reporter('default'))
         .pipe(jshint.reporter('fail'));
 });