diff --git a/spec/runner.rb b/spec/runner.rb
index <HASH>..<HASH> 100755
--- a/spec/runner.rb
+++ b/spec/runner.rb
@@ -4,19 +4,25 @@ require 'rest_client'
 require 'json'
 
 # setup tunnel
+retries = 30
 begin
+  `rm -f BrowserStackLocal.zip BrowserStackLocal`
   `curl https://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-x64.zip > BrowserStackLocal.zip`
   `unzip BrowserStackLocal.zip`
   `chmod a+x BrowserStackLocal`
 
-  tunnel = IO.popen './BrowserStackTunnel --key $BS_AUTHKEY --local-proxy-port 9292 --local-identifier $TRAVIS_JOB_ID'
+  tunnel = IO.popen './BrowserStackLocal --key $BS_AUTHKEY --only localhost,9292,0 --local-identifier $TRAVIS_JOB_ID'
 
   loop do
     break if tunnel.gets.start_with? 'You can now access'
   end
 rescue => e
-  puts "Error while using a BrowserStackTunnel: #{e.inspect}"
-  retry
+  puts "Error while using a BrowserStackLocal: #{e.inspect}"
+  sleep 5
+  retries -= 1
+  retry if retries > 0
+  puts "No retries left"
+  exit
 end
 
 # configure based on environment variables
Try replacing BrowserStackTunnel again