diff --git a/addon/src/qunit-configuration.js b/addon/src/qunit-configuration.js
index 20abdd0c..f25e56c8 100644
--- a/addon/src/qunit-configuration.js
+++ b/addon/src/qunit-configuration.js
@@ -2,7 +2,6 @@ import * as QUnit from 'qunit';
 
 QUnit.config.autostart = false;
 QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container' });
-QUnit.config.urlConfig.push({ id: 'nolint', label: 'Disable Linting' });
 QUnit.config.urlConfig.push({ id: 'devmode', label: 'Development mode' });
 
 QUnit.config.testTimeout = QUnit.urlParams.devmode ? null : 60000; //Default Test Timeout 60 Seconds
diff --git a/addon/src/test-loader.js b/addon/src/test-loader.js
index 1d111f4e..4b51ca04 100644
--- a/addon/src/test-loader.js
+++ b/addon/src/test-loader.js
@@ -1,13 +1,8 @@
 import * as QUnit from 'qunit';
 import AbstractTestLoader, {
-  addModuleExcludeMatcher,
   addModuleIncludeMatcher,
 } from 'ember-cli-test-loader/test-support/index';
 
-addModuleExcludeMatcher(function (moduleName) {
-  return QUnit.urlParams.nolint && moduleName.match(/\.(jshint|lint-test)$/);
-});
-
 addModuleIncludeMatcher(function (moduleName) {
   return moduleName.match(/\.jshint$/);
 });
@@ -46,13 +41,6 @@ export class TestLoader extends AbstractTestLoader {
    Load tests following the default patterns:
 
    * The module name ends with `-test`
-   * The module name ends with `.jshint`
-
-   Excludes tests that match the following
-   patterns when `?nolint` URL param is set:
-
-   * The module name ends with `.jshint`
-   * The module name ends with `-lint-test`
 
    @method loadTests
  */