diff --git a/.circleci/config.yml b/.circleci/config.yml
index feb80cdc9c1ba..227627b956083 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,7 @@ jobs:
           at: .
       - run:
           name: Production Tests
-          command: '[[ ! -z $BROWSERSTACK_USERNAME ]] && yarn testall test/integration/production/ || echo "Not running for PR"'
+          command: 'if [[ ! -z $BROWSERSTACK_USERNAME ]]; then yarn testall test/integration/production/; else echo "Not running for PR"; fi'
           environment:
             BROWSERSTACK: 'true'
             BROWSER_NAME: 'ie'
diff --git a/test/lib/next-webdriver.js b/test/lib/next-webdriver.js
index 651bca85f9da0..30290ee995c5a 100644
--- a/test/lib/next-webdriver.js
+++ b/test/lib/next-webdriver.js
@@ -87,5 +87,7 @@ function getBrowser (url, timeout) {
   })
 }
 
-if (global.isBrowserStack) webdriver = global.bsBrowser
+if (global.isBrowserStack) {
+  webdriver = (...args) => global.bsWd(...args)
+}
 export default webdriver