diff --git a/bin/run-lint b/bin/run-lint
index 38bb63832e52..a790ebddac45 100755
--- a/bin/run-lint
+++ b/bin/run-lint
@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 const child_process = require( 'child_process' );
 const path = require( 'path' );
-var args = [ '--cache', '--quiet', '--ext=.js',  '--ext=.jsx' ];
-if ( process.argv.length > 2 ) {
-	args = args.concat( process.argv.slice( 2 ) );
-} else {
-	args = args.concat( [ '.' ] );
+var args = [ '--cache', '--quiet', '--ext=.js', '--ext=.jsx' ];
+if ( process.argv.length <= 2 ) {
+        process.exit( 0 );
 }
 
+args = args.concat( process.argv.slice( 2 ) );
+
 const results = child_process.spawnSync( path.join( '.', 'node_modules', '.bin', 'eslint' ), args );
 
 if ( results.stdout ) {
diff --git a/circle.yml b/circle.yml
index 0c5eab672e4c..4689529cae1d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,13 +6,7 @@ test:
     - NODE_ENV=test make client/config/index.js:
         parallel: true
   override:
-    - bin/run-lint :
-        parallel: true
-        files:
-          - client/**/*.js
-          - client/**/*.jsx
-          - server/**/*.js
-          - server/**/*.jsx
+    - bin/run-lint $(git diff --name-only $(git merge-base $(git rev-parse --abbrev-ref HEAD) origin/master)..HEAD *js *jsx)
     - MOCHA_FILE=./test-results-client.xml npm run test-client -- -R mocha-junit-reporter -t $CIRCLE_NODE_TOTAL -i $CIRCLE_NODE_INDEX:
         parallel: true
     - MOCHA_FILE=./test-results-server.xml npm run test-server -- -R mocha-junit-reporter -t $CIRCLE_NODE_TOTAL -i $CIRCLE_NODE_INDEX:
diff --git a/package.json b/package.json
index f776e6c6270e..653fdca3dcc6 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
     "test-client:watch": "nodemon -e js,jsx --exec npm run test-client",
     "test-server:watch": "nodemon -e js,jsx --exec npm run test-server",
     "test-test:watch": "nodemon -e js,jsx --exec npm run test-test",
-    "lint": "bin/run-lint",
+    "lint": "bin/run-lint .",
     "css-lint": "stylelint 'client/**/*.scss' --syntax scss"
   },
   "devDependencies": {