diff --git a/.travis.yml b/.travis.yml
index 365e0ab47..33d4eb9fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,8 +94,8 @@ jobs:
     - cd test/integration
     - npm install
     - cd -
-    script: npm run smoke
+    script: npm run smoke-sauce
 stages:
 - test
 - name: smoke
-  if: branch IN (travis) and type != pull_request
+  if: type != pull_request
diff --git a/test/integration/selenium-helpers.js b/test/integration/selenium-helpers.js
index dcd96476f..5b6e6e392 100644
--- a/test/integration/selenium-helpers.js
+++ b/test/integration/selenium-helpers.js
@@ -3,6 +3,8 @@ const bindAll = require('lodash.bindall');
 
 const headless = process.env.SMOKE_HEADLESS || false;
 const remote = process.env.SMOKE_REMOTE || false;
+const ci = process.env.CI || false;
+const buildID = process.env.TRAVIS_BUILD_NUMBER;
 const {SAUCE_USERNAME, SAUCE_ACCESS_KEY} = process.env;
 const {By, until} = webdriver;
 
@@ -24,7 +26,13 @@ class SeleniumHelper {
     }
     buildDriver (name) {
         if (remote === 'true'){
-            this.driver = this.getSauceDriver(SAUCE_USERNAME, SAUCE_ACCESS_KEY, name);
+            let nameToUse;
+            if (ci === 'true'){
+                nameToUse = 'travis ' + buildID + ' : ' + name;
+            } else {
+                nameToUse = name;
+            }
+            this.driver = this.getSauceDriver(SAUCE_USERNAME, SAUCE_ACCESS_KEY, nameToUse);
         } else {
             this.driver = this.getDriver();
         }