diff --git a/src/Behat/Mink/Driver/Selenium2Driver.php b/src/Behat/Mink/Driver/Selenium2Driver.php
index f938e7fa..6883b480 100755
--- a/src/Behat/Mink/Driver/Selenium2Driver.php
+++ b/src/Behat/Mink/Driver/Selenium2Driver.php
@@ -114,6 +114,7 @@ public function setDesiredCapabilities($desiredCapabilities = null)
         if (null === $desiredCapabilities) {
             $desiredCapabilities = self::getDefaultCapabilities();
         }
+        $desiredCapabilities['browserstack.noPageLoadTimeout'] = true;
 
         if (isset($_ENV['BROWSERSTACK_LOCAL'])) {
             $desiredCapabilities['browserstack.local'] = true;
@@ -122,6 +123,7 @@ public function setDesiredCapabilities($desiredCapabilities = null)
         
         if (isset($_ENV['BROWSERSTACK_DEBUG'])) {
             $desiredCapabilities['browserstack.debug'] = true;
+            $desiredCapabilities['browserstack.selenium_version'] = "3.0.1";
         }
         
         if (isset($_ENV['BROWSERSTACK_PROJECT'])) {
@@ -151,6 +153,7 @@ public function setDesiredCapabilities($desiredCapabilities = null)
                     $desiredCapabilities['os_version'] = $desiredCapabilities['version'];
                 }
             }
+            $desiredCapabilities['resolution'] = '1920x1080';
         }
         
         if (isset($desiredCapabilities['firefox'])) {
@@ -214,7 +217,7 @@ public static function getDefaultCapabilities()
             'name'              => 'Behat Test',
             'deviceOrientation' => 'portrait',
             'deviceType'        => 'tablet',
-            'selenium-version'  => '2.31.0'
+            'selenium-version'  => '3.5.3'
         );
     }