diff --git a/.eslintignore b/.eslintignore
index a04f7ea215e0865c49c13c478b6fb3c2acc7c6b8..a43f4ca913c8b3afc9a769b4c0a0b2914ceec319 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,5 @@
-core/assets/vendor/*
+core/assets/vendor/**/*
 core/modules/locale/tests/locale_test.js
 core/modules/tour/js/jquery.joyride-2.0.3.js
-core/vendor/*
-sites/*/files
+core/vendor/**/*
+sites/**/files/**/*
diff --git a/.eslintrc b/.eslintrc
index b33ca06a81aa52af89ee113cb932f8521c4e5719..97ff8623efed3682b9c7a6582d756c60cd421156 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -16,9 +16,10 @@
   "rules": {
     "eqeqeq": [2, "smart"],
     "guard-for-in": 2,
+    "no-mixed-spaces-and-tabs": 2,
+    "no-trailing-spaces": 2,
     "no-undef": 2,
-    //"no-unused-vars": [2, {"vars": "local", "args": "none"}],
-    "no-unused-vars": 0,
+    "no-unused-vars": [2, {"vars": "local", "args": "none"}],
     "strict": 2,
     "new-cap": 0,
     "quotes": 0,