diff --git a/.circleci/config.yml b/.circleci/config.yml
index fbf7e77e10f..16bdd5b317e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -47,4 +47,4 @@ jobs:
       # run tests!
       - run: 
           name: BrowserStack testing
-          command: gulp test --browserstack
+          command: gulp test --browserstack --nolintfix
diff --git a/gulpfile.js b/gulpfile.js
index 8775b651b9f..d3b29aa66a7 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -83,7 +83,7 @@ function lint(done) {
     return file.eslint != null && file.eslint.fixed;
   }
   return gulp.src(['src/**/*.js', 'modules/**/*.js', 'test/**/*.js'], {base: './'})
-    .pipe(eslint({fix: true}))
+    .pipe(gulpif(argv.nolintfix, eslint(), eslint({fix: true})))
     .pipe(eslint.format('stylish'))
     .pipe(eslint.failAfterError())
     .pipe(gulpif(isFixed, gulp.dest('./')));