diff --git a/scripts/test.js b/scripts/test.js
index bf37c5557..0204808af 100755
--- a/scripts/test.js
+++ b/scripts/test.js
@@ -12,10 +12,10 @@ var passingTests = [
   // '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',
-  // 'node built/cli.js spec/onPreparePromiseFileConf.js',
+  'node built/cli.js spec/onPrepareConf.js',
+  'node built/cli.js spec/onPrepareFileConf.js',
+  'node built/cli.js spec/onPreparePromiseConf.js',
+  'node built/cli.js spec/onPreparePromiseFileConf.js',
   // 'node built/cli.js spec/mochaConf.js',
   // 'node built/cli.js spec/withLoginConf.js',
   // 'node built/cli.js spec/suitesConf.js --suite okmany',
diff --git a/spec/onPrepare/asyncstartup.js b/spec/onPrepare/asyncstartup.js
index 5d5e0e593..9b0e9416e 100644
--- a/spec/onPrepare/asyncstartup.js
+++ b/spec/onPrepare/asyncstartup.js
@@ -1,5 +1,6 @@
-var q = require('q');
-
-module.exports = q.fcall(function() {
+module.exports = async() => {
   browser.params.password = '12345';
-}).delay(1000);
+  return await new Promise((resolve, _) => {
+    setTimeout(resolve, 1000);
+  });
+}
diff --git a/spec/onPrepare/onPrepare_spec.js b/spec/onPrepare/onPrepare_spec.js
index 9766ebccf..6c43e91de 100644
--- a/spec/onPrepare/onPrepare_spec.js
+++ b/spec/onPrepare/onPrepare_spec.js
@@ -1,5 +1,5 @@
-describe('onPrepare function in the config', function() {
-  it('should have a special variable set in onPrepare', function() {
+describe('onPrepare function in the config', () => {
+  it('should have a special variable set in onPrepare', () => {
     expect(browser.params.password).toEqual('12345');
   });
 });
diff --git a/spec/onPrepareConf.js b/spec/onPrepareConf.js
index 25f6d93b2..3359ff5d5 100644
--- a/spec/onPrepareConf.js
+++ b/spec/onPrepareConf.js
@@ -1,10 +1,11 @@
 // Configuration using a function in onPrepare to set a parameter before
 // testing.
-var env = require('./environment.js');
+const env = require('./environment.js');
 
 // The main suite of Protractor tests.
 exports.config = {
   mockSelenium: true,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
@@ -16,7 +17,7 @@ exports.config = {
 
   baseUrl: env.baseUrl + '/ng1/',
 
-  onPrepare: function() {
+  onPrepare: () => {
     browser.params.password = '12345';
   }
 };
diff --git a/spec/onPrepareFileConf.js b/spec/onPrepareFileConf.js
index bd67998c1..32f0f0f57 100644
--- a/spec/onPrepareFileConf.js
+++ b/spec/onPrepareFileConf.js
@@ -1,9 +1,10 @@
-var env = require('./environment.js');
+const env = require('./environment.js');
 
 // Configuration using a string in onPrepare to load a file with code to
 // execute once before tests.
 exports.config = {
   mockSelenium: true,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
diff --git a/spec/onPreparePromiseConf.js b/spec/onPreparePromiseConf.js
index 8ec3cb9c3..b01e527ac 100644
--- a/spec/onPreparePromiseConf.js
+++ b/spec/onPreparePromiseConf.js
@@ -1,11 +1,12 @@
 // Configuration using a function in onPrepare to set a parameter before
 // testing.
-var env = require('./environment.js');
+const env = require('./environment.js');
 var q = require('q');
 
 // The main suite of Protractor tests.
 exports.config = {
   mockSelenium: true,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
@@ -17,9 +18,10 @@ exports.config = {
 
   baseUrl: env.baseUrl + '/ng1/',
 
-  onPrepare: function() {
-    return q.fcall(function() {
-      browser.params.password = '12345';
-    }).delay(1000);
+  onPrepare: async() => {
+    browser.params.password = '12345';
+    return await new Promise(resolve => {
+      setTimeout(resolve, 1000);
+    });
   }
 };