diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000000000000000000000000000000000000..a04f7ea215e0865c49c13c478b6fb3c2acc7c6b8
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,5 @@
+core/assets/vendor/*
+core/modules/locale/tests/locale_test.js
+core/modules/tour/js/jquery.joyride-2.0.3.js
+core/vendor/*
+sites/*/files
diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000000000000000000000000000000000000..b33ca06a81aa52af89ee113cb932f8521c4e5719
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,33 @@
+{
+  "env": {
+    "browser": true
+  },
+  "globals": {
+    "Drupal": true,
+    "drupalSettings": true,
+    "domready": true,
+    "jQuery": true,
+    "_": true,
+    "matchMedia": true,
+    "Backbone": true,
+    "Modernizr": true,
+    "CKEDITOR": true
+  },
+  "rules": {
+    "eqeqeq": [2, "smart"],
+    "guard-for-in": 2,
+    "no-undef": 2,
+    //"no-unused-vars": [2, {"vars": "local", "args": "none"}],
+    "no-unused-vars": 0,
+    "strict": 2,
+    "new-cap": 0,
+    "quotes": 0,
+    "camelcase": 0,
+    "no-underscore-dangle": 0,
+    "no-new": 0,
+    "no-alert": 0,
+    "no-use-before-define": 0,
+    "consistent-return": 0,
+    "no-constant-condition": 0
+  }
+}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 48dd3ef40c886a0cd8663065cbfeea08464d57f8..0000000000000000000000000000000000000000
--- a/.jshintignore
+++ /dev/null
@@ -1,4 +0,0 @@
-core/assets/vendor
-core/modules/tour/js/jquery.joyride-2.0.3.js
-core/vendor
-sites/*/files
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 9bd6b54d55bd1143f5d8000a407648f30f7e3d53..0000000000000000000000000000000000000000
--- a/.jshintrc
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "browser"   : true,
-  "curly"     : true,
-  "eqeqeq"    : true,
-  "forin"     : true,
-  "indent"    : 2,
-  "latedef"   : true,
-  "newcap"    : true,
-  "noarg"     : true,
-  "strict"    : true,
-  "trailing"  : true,
-  "undef"     : true,
-  "unused"    : "vars",
-  "predef"    : [
-    "Drupal",
-    "drupalSettings",
-    "domready",
-    "jQuery",
-    "_",
-    "matchMedia",
-    "Backbone",
-    "Modernizr",
-    "CKEDITOR"
-  ]
-}