diff --git a/scripts/test.js b/scripts/test.js
index 32b6bf6a3..f219b33dd 100755
--- a/scripts/test.js
+++ b/scripts/test.js
@@ -7,14 +7,11 @@ var passingTests = [
   'node built/cli.js spec/basicConf.js',
   // 'node built/cli.js spec/basicConf.js --useBlockingProxy',
   'node built/cli.js spec/multiConf.js',
-  // 'node built/cli.js spec/altRootConf.js',
-  // 'node built/cli.js spec/inferRootConf.js',
-  // 'node built/cli.js spec/multiConf.js',
   'node built/cli.js spec/altRootConf.js',
   'node built/cli.js spec/inferRootConf.js',
-  // 'node built/cli.js spec/onCleanUpAsyncReturnValueConf.js',
-  // 'node built/cli.js spec/onCleanUpNoReturnValueConf.js',
-  // 'node built/cli.js spec/onCleanUpSyncReturnValueConf.js',
+  'node built/cli.js spec/onCleanUpAsyncReturnValueConf.js',
+  'node built/cli.js spec/onCleanUpNoReturnValueConf.js',
+  'node built/cli.js spec/onCleanUpSyncReturnValueConf.js',
   'node built/cli.js spec/onPrepareConf.js',
   'node built/cli.js spec/onPrepareFileConf.js',
   'node built/cli.js spec/onPreparePromiseConf.js',
diff --git a/spec/onCleanUp/onCleanUp_spec.js b/spec/onCleanUp/onCleanUp_spec.js
index 8522aaa80..7b6fe089b 100644
--- a/spec/onCleanUp/onCleanUp_spec.js
+++ b/spec/onCleanUp/onCleanUp_spec.js
@@ -1,5 +1,5 @@
-describe('onCleanUp function in the config', function() {
-  it('should not be affected by tests', function() {
+describe('onCleanUp function in the config', () => {
+  it('should not be affected by tests', () => {
     expect(true).toBe(true);
   });
 });
diff --git a/spec/onCleanUpAsyncReturnValueConf.js b/spec/onCleanUpAsyncReturnValueConf.js
index 7c0a45f0f..56b3d0e85 100644
--- a/spec/onCleanUpAsyncReturnValueConf.js
+++ b/spec/onCleanUpAsyncReturnValueConf.js
@@ -1,9 +1,9 @@
-var env = require('./environment.js');
-var q = require('q');
+const env = require('./environment.js');
 
 // Test that onCleanUp actions are performed.
 exports.config = {
   mockSelenium: true,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
@@ -15,11 +15,9 @@ exports.config = {
 
   baseUrl: env.baseUrl + '/ng1/',
 
-  onCleanUp: function(exitCode) {
-    var deferred = q.defer();
-    setTimeout(function() {
-      deferred.resolve(exitCode);
-    }, 500);
-    return deferred.promise;
+  onCleanUp: async(exitCode) => {
+    return await new Promise(resolve => {
+      setTimeout(resolve(exitCode), 500);
+    });
   }
 };
diff --git a/spec/onCleanUpNoReturnValueConf.js b/spec/onCleanUpNoReturnValueConf.js
index 50353b3c4..b2bfdae1a 100644
--- a/spec/onCleanUpNoReturnValueConf.js
+++ b/spec/onCleanUpNoReturnValueConf.js
@@ -1,8 +1,9 @@
-var env = require('./environment.js');
+const env = require('./environment.js');
 
 // Test that onCleanUp actions are performed.
 exports.config = {
   mockSelenium: true,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
@@ -14,7 +15,7 @@ exports.config = {
 
   baseUrl: env.baseUrl + '/ng1/',
 
-  onCleanUp: function(/* exitCode */) {
+  onCleanUp: (/* exitCode */) => {
     // no return
   }
 };
diff --git a/spec/onCleanUpSyncReturnValueConf.js b/spec/onCleanUpSyncReturnValueConf.js
index 460df1558..2085db6d1 100644
--- a/spec/onCleanUpSyncReturnValueConf.js
+++ b/spec/onCleanUpSyncReturnValueConf.js
@@ -1,8 +1,9 @@
-var env = require('./environment.js');
+const env = require('./environment.js');
 
 // Test that onCleanUp actions are performed.
 exports.config = {
   mockSelenium: true,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
@@ -14,7 +15,7 @@ exports.config = {
 
   baseUrl: env.baseUrl + '/ng1/',
 
-  onCleanUp: function(exitCode) {
+  onCleanUp: (exitCode) => {
     return exitCode;
   }
 };