diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index 7db9a84279..fbd024b7ea 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -96,7 +96,7 @@ rules:
   key-spacing: [2, {mode: minimum}]
   keyword-spacing: 2
   linebreak-style: [2, unix]
-  max-len: [2, 80, 2]
+  max-len: [2, {code: 80, ignoreUrls: true, tabWidth: 2}]
   new-parens: 2
   no-mixed-spaces-and-tabs: 2
   no-multiple-empty-lines: [2, {max: 2, maxEOF: 0, maxBOF: 0}]
diff --git a/lib/_http_server.js b/lib/_http_server.js
index d036a410f6..c9397a0bc2 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -234,11 +234,9 @@ function Server(requestListener) {
     this.addListener('request', requestListener);
   }
 
-  /* eslint-disable max-len */
   // Similar option to this. Too lazy to write my own docs.
   // http://www.squid-cache.org/Doc/config/half_closed_clients/
   // http://wiki.squid-cache.org/SquidFaq/InnerWorkings#What_is_a_half-closed_filedescriptor.3F
-  /* eslint-enable max-len */
   this.httpAllowHalfOpen = false;
 
   this.addListener('connection', connectionListener);
diff --git a/test/parallel/test-process-env.js b/test/parallel/test-process-env.js
index 5ea0a4a57e..cc173e2e31 100644
--- a/test/parallel/test-process-env.js
+++ b/test/parallel/test-process-env.js
@@ -49,7 +49,6 @@ if (process.argv[2] === 'you-are-the-child') {
 delete process.env.NON_EXISTING_VARIABLE;
 assert.strictEqual(true, delete process.env.NON_EXISTING_VARIABLE);
 
-/* eslint-disable max-len */
 /* For the moment we are not going to support setting the timezone via the
  * environment variables. The problem is that various V8 platform backends
  * deal with timezone in different ways. The windows platform backend caches
@@ -66,7 +65,6 @@ date = new Date('Fri, 10 Sep 1982 03:15:00 GMT');
 assert.strictEqual(3, date.getUTCHours());
 assert.strictEqual(5, date.getHours());
 */
-/* eslint-enable max-len */
 
 // Environment variables should be case-insensitive on Windows, and
 // case-sensitive on other platforms.