diff --git a/.travis.yml b/.travis.yml
index e6cf713..4f733f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,5 +8,5 @@ env:
   - secure: "Y2Av+Gd3z9uQEB36GwdOOuGka0hx0/HeitASEo59z934O8RxnmN9eNTXS7dDT3XtKtwxIyLTOEpS7qlRdWahH28hr/dS4xJj6ao58C+1xMcDs6NAPGmDxUlcJWpcGEsnjmXjQCc3fBioSTdpIBrK/gdvgpNh77UKG74Sk7Z+YGk="
   - secure: "YI+YbTOGf2x4fPMKW+KhJiZWswoXT6xOKGwLfsQsVwmFX1LerJouil5D5iYOQuL4FE3pNaoJSNakIsokJQuGKJMmnPc8rdhMZuBJBk6MRghurE2Xe9qBHfuUBPlfD61nARESm4WDcyMwM0QVYaOKeY6aIpZ91qbUbyc60EEx3C4="
 before_script:
-- npm install -g grunt-cli
-- curl https://gist.github.com/niklasvh/6150144/raw/sauce_connect_setup.sh | bash
+  - curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
+  - npm install -g grunt-cli
diff --git a/package.json b/package.json
index a53ee68..0518e79 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "base64-arraybuffer": ">= 0.1.0",
     "png-js": ">= 0.1.1",
     "baconjs": "0.7.11",
-    "wd": "~0.2.7",
+    "wd": "0.2.21",
     "grunt-contrib-connect": "0.7.1"
   },
   "scripts": {
diff --git a/tests/selenium.js b/tests/selenium.js
index f751b2d..365b6b2 100644
--- a/tests/selenium.js
+++ b/tests/selenium.js
@@ -125,6 +125,9 @@
     function webdriverStream(test) {
         var browser = wd.remote("localhost", 4445, process.env.SAUCE_USERNAME, process.env.SAUCE_ACCESS_KEY);
         var browserStream = new Bacon.Bus();
+        test.capabilities["tunnel-identifier"] = process.env.TRAVIS_JOB_NUMBER;
+        test.capabilities["name"] = process.env.TRAVIS_BUILD_NUMBER;
+
         var resultStream = Bacon.fromNodeCallback(browser, "init", test.capabilities)
             .flatMap(Bacon.fromNodeCallback(browser, "setImplicitWaitTimeout", 15000)
                 .flatMap(function() {