diff --git a/.eslintrc b/.eslintrc
index 49f77d35452e04..a15348e702b1d2 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,18 +1,6 @@
 env:
   node: true
-
-# enable ECMAScript features
-ecmaFeatures:
-  arrowFunctions: true
-  binaryLiterals: true
-  blockBindings: true
-  classes: true
-  forOf: true
-  generators: true
-  objectLiteralShorthandMethods: true
-  objectLiteralShorthandProperties: true
-  octalLiterals: true
-  templateStrings: true
+  es6: true
 
 rules:
   # Possible Errors
@@ -55,12 +43,10 @@ rules:
   no-trailing-spaces: 2
   quotes: [2, "single", "avoid-escape"]
   semi: 2
-  space-after-keywords: 2
   space-before-blocks: [2, "always"]
   space-before-function-paren: [2, "never"]
   space-in-parens: [2, "never"]
   space-infix-ops: 2
-  space-return-throw-case: 2
   space-unary-ops: 2
 
   # ECMAScript 6
diff --git a/tools/eslint-rules/new-with-error.js b/tools/eslint-rules/new-with-error.js
index b0f550db2ffa2c..655f34bf080956 100644
--- a/tools/eslint-rules/new-with-error.js
+++ b/tools/eslint-rules/new-with-error.js
@@ -24,11 +24,6 @@ module.exports = function(context) {
 
 module.exports.schema = {
   'type': 'array',
-  'items': [
-    {
-      'enum': [0, 1, 2]
-    }
-  ],
   'additionalItems': {
     'type': 'string'
   },
diff --git a/tools/eslint-rules/require-buffer.js b/tools/eslint-rules/require-buffer.js
index 4fec765d7e9a18..c9818cb758f7bd 100644
--- a/tools/eslint-rules/require-buffer.js
+++ b/tools/eslint-rules/require-buffer.js
@@ -1,16 +1,19 @@
 'use strict';
 
-const msg = 'Use const Buffer = require(\'buffer\').Buffer; ' +
-            'at the beginning of this file';
-
 module.exports = function(context) {
+  function flagIt(reference) {
+    const msg = 'Use const Buffer = require(\'buffer\').Buffer; ' +
+                'at the beginning of this file';
+    context.report(reference.identifier, msg);
+  }
+
   return {
     'Program:exit': function() {
-      context.getScope().through.forEach(function(ref) {
-        if (ref.identifier.name === 'Buffer') {
-          context.report(ref.identifier, msg);
-        }
-      });
+      const globalScope = context.getScope();
+      const variable = globalScope.set.get('Buffer');
+      if (variable) {
+        variable.references.forEach(flagIt);
+      }
     }
   };
 };
diff --git a/tools/eslint-rules/required-modules.js b/tools/eslint-rules/required-modules.js
index 94ef1e2ac03def..3e4a8e8aadfc82 100644
--- a/tools/eslint-rules/required-modules.js
+++ b/tools/eslint-rules/required-modules.js
@@ -92,11 +92,6 @@ module.exports = function(context) {
 
 module.exports.schema = {
   'type': 'array',
-  'items': [
-    {
-      'enum': [0, 1, 2]
-    }
-  ],
   'additionalItems': {
     'type': 'string'
   },