diff --git a/package.json b/package.json
index 083ee393d..c8b75e441 100644
--- a/package.json
+++ b/package.json
@@ -434,7 +434,7 @@
   "version": "1.7.1",
   "license": "MIT",
   "scripts": {
-    "lint": "eslint client/**/*.js common/**/*.js context/**/*.js gruntfile.js wallaby.js lib/**/*.js test/**/*.js static/debug.js",
+    "lint": "eslint client/**/*.js common/**/*.js context/**/*.js gruntfile.js wallaby.js lib/**/*.js test/unit/**/*.js test/client/*.js test/e2e/**/*.js static/debug.js",
     "test": "grunt test",
     "build": "grunt build",
     "test:appveyor": "grunt test-appveyor",
diff --git a/test/e2e/step_definitions/core_steps.js b/test/e2e/step_definitions/core_steps.js
index 6b0fe8c70..dbd638d0b 100644
--- a/test/e2e/step_definitions/core_steps.js
+++ b/test/e2e/step_definitions/core_steps.js
@@ -1,13 +1,17 @@
-var {defineSupportCode} = require('cucumber')
-
-defineSupportCode(function ({defineParameterType, Given, Then, When}) {
-  var fs = require('fs')
-  var path = require('path')
-  var ref = require('child_process')
-  var exec = ref.exec
-  var spawn = ref.spawn
-  var rimraf = require('rimraf')
-  var stopper = require('../../../lib/stopper')
+var cucumber = require('cucumber')
+var fs = require('fs')
+var path = require('path')
+var ref = require('child_process')
+var exec = ref.exec
+var spawn = ref.spawn
+var rimraf = require('rimraf')
+var stopper = require('../../../lib/stopper')
+
+cucumber.defineSupportCode((a) => {
+  var When = a.When
+  var Then = a.Then
+  var Given = a.Given
+  var defineParameterType = a.defineParameterType
 
   var baseDir = fs.realpathSync(path.join(__dirname, '/../../..'))
   var tmpDir = path.join(baseDir, 'tmp', 'sandbox')
diff --git a/test/e2e/step_definitions/hooks.js b/test/e2e/step_definitions/hooks.js
index 9be4aa5ce..48e0e30ad 100644
--- a/test/e2e/step_definitions/hooks.js
+++ b/test/e2e/step_definitions/hooks.js
@@ -1,7 +1,7 @@
-var {defineSupportCode} = require('cucumber')
+var cucumber = require('cucumber')
 
-defineSupportCode(function ({After}) {
-  After(function (scenario, callback) {
+cucumber.defineSupportCode((a) => {
+  a.After(function (scenario, callback) {
     var running = this.child != null && typeof this.child.kill === 'function'
 
     if (running) {
diff --git a/test/e2e/support/env.js b/test/e2e/support/env.js
index e58cd18c9..566e5e7cb 100644
--- a/test/e2e/support/env.js
+++ b/test/e2e/support/env.js
@@ -1,5 +1,5 @@
-var {defineSupportCode} = require('cucumber')
+var cucumber = require('cucumber')
 
-defineSupportCode(function ({setDefaultTimeout}) {
-  setDefaultTimeout(60 * 1000)
+cucumber.defineSupportCode((a) => {
+  a.setDefaultTimeout(60 * 1000)
 })
diff --git a/test/e2e/support/world.js b/test/e2e/support/world.js
index 584b3bbd7..69d28c185 100644
--- a/test/e2e/support/world.js
+++ b/test/e2e/support/world.js
@@ -4,7 +4,7 @@ var path = require('path')
 var hasher = require('crypto').createHash
 var mkdirp = require('mkdirp')
 var _ = require('lodash')
-var {defineSupportCode} = require('cucumber')
+var cucumber = require('cucumber')
 
 function World () {
   this.proxy = require('./proxy')
@@ -63,6 +63,6 @@ function World () {
   }
 }
 
-defineSupportCode(function ({setWorldConstructor}) {
-  setWorldConstructor(World)
+cucumber.defineSupportCode((a) => {
+  a.setWorldConstructor(World)
 })
diff --git a/test/unit/middleware/source_files.spec.js b/test/unit/middleware/source_files.spec.js
index 9b3bc3c2f..3d43751d5 100644
--- a/test/unit/middleware/source_files.spec.js
+++ b/test/unit/middleware/source_files.spec.js
@@ -128,8 +128,7 @@ describe('middleware.source_files', function () {
       .expect(200, 'js-src-a')
       .then(function () {
         return expect(next).not.to.have.been.called
-      }
-    )
+      })
   })
 
   it('should send strict caching headers for js source files with sha', function () {
@@ -143,8 +142,7 @@ describe('middleware.source_files', function () {
       .expect(200)
       .then(function () {
         return expect(next).not.to.have.been.called
-      }
-    )
+      })
   })
 
   it('should send strict caching headers for js source files with sha (in basePath)', function () {
@@ -174,8 +172,7 @@ describe('middleware.source_files', function () {
       .expect(200)
       .then(function () {
         return expect(next).not.to.have.been.called
-      }
-    )
+      })
   })
 
   it('should not serve files that are not in served', function () {
@@ -208,8 +205,7 @@ describe('middleware.source_files', function () {
       .expect(200, 'utf8-file')
       .then(function () {
         return expect(next).not.to.have.been.called
-      }
-    )
+      })
   })
 
   it('should serve js source file from paths containing HTML URL encoded chars', function () {
@@ -224,8 +220,7 @@ describe('middleware.source_files', function () {
       .expect(200, 'utf8-file')
       .then(function () {
         return expect(next).not.to.have.been.called
-      }
-    )
+      })
   })
 
   it('should set content-type headers', function () {
@@ -252,8 +247,7 @@ describe('middleware.source_files', function () {
       .expect(200, 'cached-content')
       .then(function () {
         return expect(next).not.to.have.been.called
-      }
-    )
+      })
   })
 
   return it('should not use cached content if doNotCache is set', function () {
@@ -270,7 +264,6 @@ describe('middleware.source_files', function () {
       .expect(200, 'js-source')
       .then(function () {
         return expect(next).not.to.have.been.called
-      }
-    )
+      })
   })
 })