diff --git a/nightwatch-browserstack.conf.js b/nightwatch-browserstack.conf.js
index 40ded315c..788bfe97f 100644
--- a/nightwatch-browserstack.conf.js
+++ b/nightwatch-browserstack.conf.js
@@ -29,30 +29,37 @@ const nightwatch_config = {
     chrome: {
       desiredCapabilities: {
         browser: 'chrome',
+        browser_version: '60',
       },
     },
     firefox: {
       desiredCapabilities: {
         browser: 'firefox',
+        browser_version: '56',
       },
     },
     safari: {
       desiredCapabilities: {
+
+        // Safari since 8 seems to have troubles with the browserstack-local tunnel (10.18.17)
         browser: 'safari',
+        browser_version: '10',
       },
     },
     ie: {
       desiredCapabilities: {
         browser: 'internet explorer',
 
-        // Windows 10 seem to have troubles with the browserstackLocal tunnel (11.17.17).
+        // Windows 10 + IE seems to have troubles with the browserstack-local tunnel (10.17.17).
         os: 'Windows',
         os_version: '8.1',
+        browser_version: '11',
       },
     },
     edge: {
       desiredCapabilities: {
         browser: 'edge',
+        browser_version: '15',
       },
     },
   }
diff --git a/scripts/e2e-ci.sh b/scripts/e2e-ci.sh
index 2b3588560..c0fc820e7 100755
--- a/scripts/e2e-ci.sh
+++ b/scripts/e2e-ci.sh
@@ -21,7 +21,7 @@ if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
   # Test using browserstack.
   browserstack chrome
   browserstack firefox
-  browserstack safari
+  # browserstack safari – Safari >= 8 has issues connecting to browserstack-local. Safari < 8 is too old.
   browserstack ie
   browserstack edge
 
diff --git a/test/e2e/specs/03_embedStream.js b/test/e2e/specs/03_embedStream.js
index 0b448a5f9..d178493ea 100644
--- a/test/e2e/specs/03_embedStream.js
+++ b/test/e2e/specs/03_embedStream.js
@@ -22,8 +22,10 @@ module.exports = {
       .waitForElementVisible('@signInButton')
       .click('@signInButton');
 
+    client.pause(3000);
+
     // Focusing on the Login PopUp
-    client.window_handles((result) => {
+    client.windowHandles((result) => {
       const handle = result.value[1];
       client.switchWindow(handle);
     });
@@ -44,7 +46,7 @@ module.exports = {
       .click('@loginButton');
 
     // Focusing on the Embed Window
-    client.window_handles((result) => {
+    client.windowHandles((result) => {
       const handle = result.value[0];
       client.switchWindow(handle);
     });
@@ -106,7 +108,7 @@ module.exports = {
   },
   'user goes to the stream and replies and reacts to comment': (client) => {
     const embedStream = client.page.embedStream();
-    
+
     const embed = embedStream
       .navigate()
       .getEmbedSection();
@@ -128,7 +130,7 @@ module.exports = {
   },
   'user logs out': (client) => {
     const embedStream = client.page.embedStream();
-    
+
     const embed = embedStream
       .navigate()
       .getEmbedSection();