diff --git a/.eslintignore b/.eslintignore
index 46a631963a4aa7..da42fb9d77a38d 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -3,3 +3,4 @@ test/addons/doc-*/
 test/fixtures
 test/**/node_modules
 test/parallel/test-fs-non-number-arguments-throw.js
+test/disabled
diff --git a/.eslintrc b/.eslintrc
index 0c43234c59411e..a504893b60eeb0 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,3 @@
-env:
-  node: true
-
 # enable ECMAScript features
 ecmaFeatures:
   blockBindings: true
@@ -10,6 +7,7 @@ ecmaFeatures:
   generators: true
   forOf: true
   objectLiteralShorthandProperties: true
+  globalReturn: true
 
 rules:
   # Possible Errors
@@ -39,14 +37,9 @@ rules:
   # Stylistic Issues
   # list: https://github.com/eslint/eslint/tree/master/docs/rules#stylistic-issues
   ## use single quote, we can use double quote when escape chars
-  quotes:
-    - 2
-    - "single"
-    - "avoid-escape"
+  quotes: [2, "single", "avoid-escape"]
   ## 2 space indentation
-  indent:
-    - 2
-    - 2
+  indent: [2, 2]
   ## add space after comma
   ## set to 'warn' because of https://github.com/eslint/eslint/issues/2408
   comma-spacing: 1
@@ -63,35 +56,75 @@ rules:
   ## require parens for Constructor
   new-parens: 2
   ## max 80 length
-  max-len:
-    - 2
-    - 80
-    - 2
+  max-len: [2, 80, 2]
 
   # Strict Mode
   # list: https://github.com/eslint/eslint/tree/master/docs/rules#strict-mode
   ## 'use strict' on top
-  strict:
-    - 2
-    - "global"
+  strict: [2, "global"]
+
+  # Variables
+  # list: https://github.com/eslint/eslint/tree/master/docs/rules#variables
+  ## disallow use of undefined variables (globals)
+  no-undef: 2
 
 # Global scoped method and vars
 globals:
-  DTRACE_HTTP_CLIENT_REQUEST: true
-  LTTNG_HTTP_CLIENT_REQUEST: true
-  COUNTER_HTTP_CLIENT_REQUEST: true
-  DTRACE_HTTP_CLIENT_RESPONSE: true
-  LTTNG_HTTP_CLIENT_RESPONSE: true
-  COUNTER_HTTP_CLIENT_RESPONSE: true
-  DTRACE_HTTP_SERVER_REQUEST: true
-  LTTNG_HTTP_SERVER_REQUEST: true
-  COUNTER_HTTP_SERVER_REQUEST: true
-  DTRACE_HTTP_SERVER_RESPONSE: true
-  LTTNG_HTTP_SERVER_RESPONSE: true
-  COUNTER_HTTP_SERVER_RESPONSE: true
-  DTRACE_NET_STREAM_END: true
-  LTTNG_NET_STREAM_END: true
-  COUNTER_NET_SERVER_CONNECTION_CLOSE: true
-  DTRACE_NET_SERVER_CONNECTION: true
-  LTTNG_NET_SERVER_CONNECTION: true
-  COUNTER_NET_SERVER_CONNECTION: true
+  # Node
+  __filename        : false
+  __dirname         : false
+  global            : false
+  GLOBAL            : false
+  root              : false
+  module            : false
+  require           : false
+  console           : false
+  exports           : false
+  process           : false
+  setTimeout        : false
+  clearTimeout      : false
+  setInterval       : false
+  clearInterval     : false
+  setImmediate      : false
+  clearImmediate    : false
+
+  # Non-standard
+  escape            : false
+  unescape          : false
+
+  # Discouraged
+  #Buffer           : false (use require('buffer').Buffer)
+
+  # Types
+  ArrayBuffer       : false
+  ArrayBufferView   : false
+  DataView          : false
+  Float32Array      : false
+  Float64Array      : false
+  Int16Array        : false
+  Int32Array        : false
+  Int8Array         : false
+  Uint16Array       : false
+  Uint32Array       : false
+  Uint8Array        : false
+  Uint8ClampedArray : false
+
+  # Tracing
+  DTRACE_HTTP_CLIENT_REQUEST           : false
+  LTTNG_HTTP_CLIENT_REQUEST            : false
+  COUNTER_HTTP_CLIENT_REQUEST          : false
+  DTRACE_HTTP_CLIENT_RESPONSE          : false
+  LTTNG_HTTP_CLIENT_RESPONSE           : false
+  COUNTER_HTTP_CLIENT_RESPONSE         : false
+  DTRACE_HTTP_SERVER_REQUEST           : false
+  LTTNG_HTTP_SERVER_REQUEST            : false
+  COUNTER_HTTP_SERVER_REQUEST          : false
+  DTRACE_HTTP_SERVER_RESPONSE          : false
+  LTTNG_HTTP_SERVER_RESPONSE           : false
+  COUNTER_HTTP_SERVER_RESPONSE         : false
+  DTRACE_NET_STREAM_END                : false
+  LTTNG_NET_STREAM_END                 : false
+  COUNTER_NET_SERVER_CONNECTION_CLOSE  : false
+  DTRACE_NET_SERVER_CONNECTION         : false
+  LTTNG_NET_SERVER_CONNECTION          : false
+  COUNTER_NET_SERVER_CONNECTION        : false
diff --git a/test/.eslintrc b/test/.eslintrc
index d5d95584ea6811..0bfb0f5877bdc6 100644
--- a/test/.eslintrc
+++ b/test/.eslintrc
@@ -3,3 +3,8 @@
 rules:
   ## allow unreachable code
   no-unreachable: 0
+  ## allow undeclared variables
+  no-undef: 0
+
+globals:
+  gc: false