diff --git a/package.json b/package.json
old mode 100644
new mode 100755
index 2942e691ae615816ca5dab717fb823dd766efdda..03c119c36b72d29510d1e678ff3d4b193ac2f0c6
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "phantomjs-prebuilt": "^2.1.13",
     "ps-tree": "^1.0.1",
     "retry-promise": "^1.0.0",
-    "selenium-webdriver": "^3.0.0-beta-1",
+    "selenium-webdriver": "^3.0.0",
     "socket.io": "^1.4.8",
     "ws": "^1.1.1"
   },
@@ -107,7 +107,7 @@
     "@types/express": "^4.0.33",
     "@types/mime": "0.0.29",
     "@types/node": "^6.0.45",
-    "@types/selenium-webdriver": "^2.53.33",
+    "@types/selenium-webdriver": "^2.53.34",
     "@types/sinon": "^1.16.31",
     "@types/socket.io": "^1.4.27",
     "@types/ws": "0.0.34",
diff --git a/src/config.ts b/src/config.ts
index 0536161e8d1494e1b2b355c95eb8741db1995b84..7f3c961be6a6c1f2c63921930db716231212e865 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -191,4 +191,12 @@ export interface Sleepable {
   sleep(millisecond: number): Promise<void>
 }
 
+/**
+ * ISSUE #72
+ * Introduce the SELENIUM_PROMISE_MANAGER environment variable.
+ * When set to 1, selenium-webdriver will use the existing ControlFlow scheduler.
+ * When set to 0, the SimpleScheduler will be used.
+ */
+process.env['SELENIUM_PROMISE_MANAGER'] = 0
+
 export { log }