diff --git a/e2e/proxy.ts b/e2e/proxy.ts
index ec533eda52..6f2a2b71b1 100644
--- a/e2e/proxy.ts
+++ b/e2e/proxy.ts
@@ -18,7 +18,8 @@
 import { browser } from 'protractor';
 
 export async function setConfigField(field: string, value: string) {
+
     return browser.executeScript(
-        `window.adf.setConfigField('${field}', '${value}');`
+        "window.adf.setConfigField(`"+field + "`, `" + value + "`);"
     );
 }
diff --git a/protractor.conf.js b/protractor.conf.js
index 7ddc2d8454..f241692646 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -22,6 +22,7 @@ let BROWSER_RUN = process.env.BROWSER_RUN;
 let FOLDER = process.env.FOLDER || '';
 let SELENIUM_SERVER = process.env.SELENIUM_SERVER || '';
 let DIRECT_CONNECCT = SELENIUM_SERVER ? false : true;
+let SELENIUM_PROMISE_MANAGER = parseInt(process.env.SELENIUM_PROMISE_MANAGER);
 let MAXINSTANCES = process.env.MAXINSTANCES || 1;
 let TIMEOUT = parseInt(process.env.TIMEOUT, 10);
 let SAVE_SCREENSHOT = (process.env.SAVE_SCREENSHOT == 'true');
@@ -199,6 +200,8 @@ exports.config = {
      */
     seleniumAddress: SELENIUM_SERVER,
 
+    SELENIUM_PROMISE_MANAGER: SELENIUM_PROMISE_MANAGER,
+
     plugins: [{
         package: 'jasmine2-protractor-utils',
         disableScreenshot: false,
@@ -213,6 +216,7 @@ exports.config = {
     },
 
     onPrepare() {
+
         retry.onPrepare();
 
         global.TestConfig = TestConfig;
@@ -269,12 +273,11 @@ exports.config = {
         fs.exists(reportsFolder, function (exists, error) {
             if (exists) {
                 rimraf(reportsFolder, function (err) {
-                    console.log('[ERROR] rimraf: ', err);
                 });
             }
 
             if (error) {
-                console.log('[ERROR] fs', error);
+                console.error('[ERROR] fs', error);
             }
         });
     },
diff --git a/scripts/test-e2e-lib.sh b/scripts/test-e2e-lib.sh
index e8b5af9195..88f4c6c9ae 100755
--- a/scripts/test-e2e-lib.sh
+++ b/scripts/test-e2e-lib.sh
@@ -8,6 +8,7 @@ EXECLINT=true
 LITESERVER=false
 EXEC_VERSION_JSAPI=false
 TIMEOUT=7000
+SELENIUM_PROMISE_MANAGER=1
 
 show_help() {
     echo "Usage: ./scripts/test-e2e-lib.sh -host adf.domain.com -u admin -p admin -e admin"
@@ -29,6 +30,7 @@ show_help() {
     echo "-timeout or --timeout override the timeout foe the wait utils"
     echo "-sl --skip-lint skip lint"
     echo "-m --maxInstances max instances parallel for tests"
+    echo "-disable-control-flow disable control flow"
     echo "-vjsapi install different version from npm of JS-API defined in the package.json"
     echo "-h or --help"
 }
@@ -104,6 +106,11 @@ max_instances(){
     MAXINSTANCES=$1
 }
 
+disable_control_flow(){
+    echo "====== disable control flow ====="
+    SELENIUM_PROMISE_MANAGER=0
+}
+
 version_js_api() {
     JSAPI_VERSION=$1
 
@@ -138,6 +145,7 @@ while [[ $1 == -* ]]; do
       -sl|--skip-lint)  skip_lint; shift;;
       -m|--maxInstances)  max_instances $2; shift 2;;
       -vjsapi)  version_js_api $2; shift 2;;
+      -disable-control-flow|--disable-control-flow)  disable_control_flow; shift;;
       -*) echo "invalid option: $1" 1>&2; show_help; exit 1;;
     esac
 done
@@ -160,6 +168,7 @@ export FOLDER=$FOLDER'/'
 export SELENIUM_SERVER=$SELENIUM_SERVER
 export NAME_TEST=$NAME_TEST
 export MAXINSTANCES=$MAXINSTANCES
+export SELENIUM_PROMISE_MANAGER=$SELENIUM_PROMISE_MANAGER
 
 
 if $EXEC_VERSION_JSAPI == true; then