diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 00000000000..c3b79f83d16
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,7 @@
+const clientESLintConfig = require('./config/eslint');
+
+module.exports = Object.assign({}, clientESLintConfig, {
+  env: Object.assign({}, clientESLintConfig.env, {
+    node: true
+  })
+});
diff --git a/scripts/eject.js b/scripts/eject.js
index a945348d3e8..75c06a4b62f 100644
--- a/scripts/eject.js
+++ b/scripts/eject.js
@@ -69,7 +69,7 @@ prompt('Are you sure you want to eject? This action is permanent. [y/N]', functi
 
   files.forEach(function(file) {
     console.log('Copying ' + file + ' to ' + hostPath);
-    content = fs
+    var content = fs
       .readFileSync(path.join(selfPath, file), 'utf8')
       // Remove license header from JS
       .replace(/^\/\*\*(\*(?!\/)|[^*])*\*\//, '')
diff --git a/tasks/e2e.sh b/tasks/e2e.sh
index 21813326dde..e2dbf6ce378 100755
--- a/tasks/e2e.sh
+++ b/tasks/e2e.sh
@@ -30,6 +30,9 @@ perl -i -p0e 's/bundledDependencies.*?]/bundledDependencies": []/s' package.json
 npm install
 scripts_path=$PWD/`npm pack`
 
+# lint
+./node_modules/.bin/eslint --ignore-path .gitignore ./
+
 # Pack CLI
 cd global-cli
 npm install