diff --git a/scripts/test.js b/scripts/test.js
index bf37c5557..e14da8e4b 100755
--- a/scripts/test.js
+++ b/scripts/test.js
@@ -22,12 +22,12 @@ var passingTests = [
   // 'node built/cli.js spec/suitesConf.js --suite okspec',
   // 'node built/cli.js spec/suitesConf.js --suite okmany,okspec',
   // 'node built/cli.js spec/plugins/smokeConf.js',
-  // 'node built/cli.js spec/plugins/multiPluginConf.js',
-  // 'node built/cli.js spec/plugins/jasminePostTestConf.js',
-  // 'node built/cli.js spec/plugins/mochaPostTestConf.js',
-  // 'node built/cli.js spec/plugins/browserGetSyncedConf.js',
-  // 'node built/cli.js spec/plugins/browserGetUnsyncedConf.js',
-  // 'node built/cli.js spec/plugins/waitForAngularConf.js',
+  'node built/cli.js spec/plugins/multiPluginConf.js',
+  'node built/cli.js spec/plugins/jasminePostTestConf.js',
+  'node built/cli.js spec/plugins/mochaPostTestConf.js',
+  'node built/cli.js spec/plugins/browserGetSyncedConf.js',
+  'node built/cli.js spec/plugins/browserGetUnsyncedConf.js',
+  'node built/cli.js spec/plugins/waitForAngularConf.js',
   // 'node built/cli.js spec/interactionConf.js',
   // 'node built/cli.js spec/directConnectConf.js',
   // 'node built/cli.js spec/restartBrowserBetweenTestsConf.js',
diff --git a/spec/plugins/browserGetSyncedConf.js b/spec/plugins/browserGetSyncedConf.js
index 87ef0e162..49957b8e9 100644
--- a/spec/plugins/browserGetSyncedConf.js
+++ b/spec/plugins/browserGetSyncedConf.js
@@ -1,9 +1,9 @@
-var env = require('../environment.js'),
-    q = require('q');
+const env = require('../environment.js');
 
 // Make sure that borwser-related plugin hooks work with browser sync on
 exports.config = {
   seleniumAddress: env.seleniumAddress,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
@@ -19,20 +19,26 @@ exports.config = {
   // Plugin patterns are relative to this directory.
   plugins: [{
     inline: {
-      onPageLoad: function() {
-        return q.delay(5000).then(function() {
-          protractor.ON_PAGE_LOAD = true;
+      onPageLoad: async function() {
+        return await new Promise(resolve => {
+          setTimeout(() => {
+            protractor.ON_PAGE_LOAD = true;
+            resolve();
+          }, 5000);
         });
       },
-      onPageStable: function() {
+      onPageStable: async function() {
         if (protractor.ON_PAGE_LOAD) {
           this.addSuccess();
         } else {
           this.addFailure(
               'onPageLoad did not finish before onPageStable began');
         }
-        return q.delay(5000).then(function() {
-          protractor.ON_PAGE_SYNC = true;
+        return await new Promise(resolve => {
+          setTimeout(() => {
+            protractor.ON_PAGE_SYNC = true;
+            resolve();
+          }, 5000);
         });
       },
       teardown: function() {
diff --git a/spec/plugins/browserGetUnsyncedConf.js b/spec/plugins/browserGetUnsyncedConf.js
index 7031d3950..4aad53a05 100644
--- a/spec/plugins/browserGetUnsyncedConf.js
+++ b/spec/plugins/browserGetUnsyncedConf.js
@@ -1,9 +1,9 @@
-var env = require('../environment.js'),
-    q = require('q');
+const env = require('../environment.js');
 
 // Make sure that borwser-related plugin hooks work with browser sync off
 exports.config = {
   seleniumAddress: env.seleniumAddress,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
@@ -22,9 +22,12 @@ exports.config = {
       setup: function() {
         browser.ignoreSynchronization = true;
       },
-      onPageLoad: function() {
-        return q.delay(5000).then(function() {
-          protractor.ON_PAGE_LOAD = true;
+      onPageLoad: async function() {
+        return await new Promise(resolve => {
+          setTimeout(() => {
+            protractor.ON_PAGE_LOAD = true;
+            resolve();
+          }, 5000);
         });
       },
       onPageStable: function() {
diff --git a/spec/plugins/multiPluginConf.js b/spec/plugins/multiPluginConf.js
index 44c799564..27986e5a3 100644
--- a/spec/plugins/multiPluginConf.js
+++ b/spec/plugins/multiPluginConf.js
@@ -3,6 +3,7 @@ var env = require('../environment.js');
 // A small suite to make sure the full functionality of plugins work
 exports.config = {
   mockSelenium: true,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
diff --git a/spec/plugins/postTestConfTemplate.js b/spec/plugins/postTestConfTemplate.js
index 185cfcbb4..41d68d564 100644
--- a/spec/plugins/postTestConfTemplate.js
+++ b/spec/plugins/postTestConfTemplate.js
@@ -1,8 +1,9 @@
 var env = require('../environment.js');
 
-module.exports = function(framework) {
+module.exports = (framework) => {
   return {
     mockSelenium: true,
+    SELENIUM_PROMISE_MANAGER: false,
 
     framework: framework,
 
diff --git a/spec/plugins/specs/bigger_spec.js b/spec/plugins/specs/bigger_spec.js
index e803fe255..d17e13d7f 100644
--- a/spec/plugins/specs/bigger_spec.js
+++ b/spec/plugins/specs/bigger_spec.js
@@ -1,9 +1,9 @@
-describe('check if plugin setup ran', function() {
-  it('should have set protractor.__BASIC_PLUGIN_RAN', function() {
+describe('check if plugin setup ran', () => {
+  it('should have set protractor.__BASIC_PLUGIN_RAN', () => {
     expect(protractor.__BASIC_PLUGIN_RAN_SETUP).toBe(true);
   });
 
-  it('should have set protractor.__INLINE_PLUGIN_RAN', function() {
+  it('should have set protractor.__INLINE_PLUGIN_RAN', () => {
     expect(protractor.__INLINE_PLUGIN_RAN).toBe(true);
   });
 });
diff --git a/spec/plugins/specs/browser_get_wait_spec.js b/spec/plugins/specs/browser_get_wait_spec.js
index 70a7a9d4c..26130f54d 100644
--- a/spec/plugins/specs/browser_get_wait_spec.js
+++ b/spec/plugins/specs/browser_get_wait_spec.js
@@ -1,6 +1,6 @@
-describe('category', function() {
-  it('name', function() {
-    browser.get('index.html');
-    browser.waitForAngular();
+describe('category', () => {
+  it('name', async() => {
+    await browser.get('index.html');
+    await browser.waitForAngular();
   });
 });
diff --git a/spec/plugins/specs/fail_spec.js b/spec/plugins/specs/fail_spec.js
index 955fcc500..a24463c0e 100644
--- a/spec/plugins/specs/fail_spec.js
+++ b/spec/plugins/specs/fail_spec.js
@@ -1,9 +1,9 @@
-describe('check if plugin setup ran', function() {
-  it('should have set protractor.__BASIC_PLUGIN_RAN', function() {
+describe('check if plugin setup ran', () => {
+  it('should have set protractor.__BASIC_PLUGIN_RAN', () =>  {
     expect(protractor.__BASIC_PLUGIN_RAN_SETUP).toBe(true);
   });
 
-  it('should run multiple tests which fail', function() {
+  it('should run multiple tests which fail', () =>  {
     expect(true).toBe(false);
   });
 });
diff --git a/spec/plugins/specs/simple_spec.js b/spec/plugins/specs/simple_spec.js
index ab92cf579..d34218bfb 100644
--- a/spec/plugins/specs/simple_spec.js
+++ b/spec/plugins/specs/simple_spec.js
@@ -1,4 +1,4 @@
-describe('category', function() {
-  it('name', function() {
+describe('category', () => {
+  it('name', () => {
   });
 });
diff --git a/spec/plugins/waitForAngularConf.js b/spec/plugins/waitForAngularConf.js
index 1e29fbe56..82177161f 100644
--- a/spec/plugins/waitForAngularConf.js
+++ b/spec/plugins/waitForAngularConf.js
@@ -1,9 +1,9 @@
-var env = require('../environment.js'),
-    q = require('q');
+var env = require('../environment.js');
 
 // A small suite to make sure that the plugin hooks for waitForAngular work
 exports.config = {
   seleniumAddress: env.seleniumAddress,
+  SELENIUM_PROMISE_MANAGER: false,
 
   framework: 'jasmine',
 
@@ -19,9 +19,12 @@ exports.config = {
   // Plugin patterns are relative to this directory.
   plugins: [{
     inline: {
-      waitForPromise: function(/* oldURL */) {
-        return q.delay(5000).then(function() {
-          protractor.WAIT_FOR_PROMISE = true;
+      waitForPromise: async function() {
+        return await new Promise(resolve => {
+          setTimeout(() => {
+            protractor.WAIT_FOR_PROMISE = true;
+            resolve();
+          }, 5000);
         });
       },
       waitForCondition: function() {
diff --git a/testapp/package-lock.json b/testapp/package-lock.json
index 97fc502b1..00c8cf57e 100644
--- a/testapp/package-lock.json
+++ b/testapp/package-lock.json
@@ -1257,14 +1257,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1279,20 +1277,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -1409,8 +1404,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -1422,7 +1416,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -1437,7 +1430,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -1445,14 +1437,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -1471,7 +1461,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -1552,8 +1541,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -1565,7 +1553,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -1687,7 +1674,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",