diff --git a/.jscsrc b/.jscsrc
index 11cd0a0c..20f9ff4a 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -5,6 +5,7 @@
     "requireMultipleVarDecl": false,
     "disallowTrailingWhitespace": "ignoreEmptyLines",
     "disallowTrailingComma": false,
+    "disallowDanglingUnderscores": false,
     "validateIndentation": false,
     "requireCurlyBraces": false,
     "requireSpacesInAnonymousFunctionExpression": {
diff --git a/.jshintrc b/.jshintrc
index 8205f3b8..15d6c6d9 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,5 +1,5 @@
 {
-    "esnext": true,
+    "esversion": 6,
     "unused"  : true,
     "bitwise" : false,
     "browser" : true,
diff --git a/package.json b/package.json
index 0879f97b..850176ed 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
     "cloudcmd": "bin/cloudcmd.js"
   },
   "config": {
+    "dirs_legacy": "bin lib",
     "dirs": "bin lib test"
   },
   "scripts": {
@@ -50,11 +51,11 @@
     "lint:style": "stylelint css/*.css",
     "lint:js": "redrun jshint jscs eslint",
     "lint:js:legacy": "redrun legacy:*",
-    "eslint": "eslint --rule 'no-console:0' bin/release.js",
+    "eslint": "eslint --rule 'no-console:0' test bin/release.js",
     "jshint": "jshint bin/release.js",
     "jscs": "jscs --esnext $npm_package_config_dirs",
-    "legacy:jshint": "jshint --config legacy/.jshintrc $npm_package_config_dirs --exclude bin/release.js",
-    "legacy:eslint": "eslint -c legacy/.eslintrc --rule 'no-console:0' $npm_package_config_dirs --ignore-path bin/release.js",
+    "legacy:jshint": "jshint --config legacy/.jshintrc $npm_package_config_dirs_dirs_legacy --exclude bin/release.js",
+    "legacy:eslint": "eslint -c legacy/.eslintrc --rule 'no-console:0' $npm_package_config_dirs_legacy --ignore-path bin/release.js",
     "test": "tape 'test/**/*.js'",
     "watch:test": "nodemon -w lib -w test -x \"npm run test\"",
     "spell": "yaspeller .",