diff --git a/.travis.yml b/.travis.yml
index 142210d258..259c50f63d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
 language: node_js
 node_js:
   - "7"
+branches:
+  only:
+  - master
+  - remix_live
 script:
   - npm run lint && npm run test && npm run downloadsolc && npm run make-mock-compiler && npm run setupremix && npm run build
   - ./ci/browser_tests.sh
diff --git a/ci/browser_tests.sh b/ci/browser_tests.sh
index e0e42fc9e1..ac1030fa42 100755
--- a/ci/browser_tests.sh
+++ b/ci/browser_tests.sh
@@ -15,7 +15,9 @@ SC_VERSION="4.4.0"
 SAUCECONNECT_URL="https://saucelabs.com/downloads/sc-$SC_VERSION-linux.tar.gz"
 SAUCECONNECT_USERNAME="chriseth"
 SAUCECONNECT_ACCESSKEY="b781828a-9e9c-43d8-89d4-2fbb879595ca"
-SAUCECONNECT_JOBIDENTIFIER="browsersolidity_tests_${CIRCLE_BUILD_NUM}"
+BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}}
+echo "$BUILD_ID"
+SAUCECONNECT_JOBIDENTIFIER="browsersolidity_tests_${BUILD_ID}"
 SAUCECONNECT_READYFILE="sc.ready"
 TEST_EXITCODE=0
 
diff --git a/nightwatch.js b/nightwatch.js
index f8bdab6866..b0adf6d836 100644
--- a/nightwatch.js
+++ b/nightwatch.js
@@ -1,6 +1,6 @@
 'use strict'
 
-var CIRCLE_BUILD_NUM = process.env.CIRCLE_BUILD_NUM
+var buildId = process.env.CIRCLE_BUILD_NUM || process.env.TRAVIS_JOB_NUMBER
 
 module.exports = {
   'src_folders': ['test-browser/tests'],
@@ -31,8 +31,8 @@ module.exports = {
         'browserName': 'firefox',
         'javascriptEnabled': true,
         'acceptSslCerts': true,
-        'build': 'build-' + CIRCLE_BUILD_NUM,
-        'tunnel-identifier': 'browsersolidity_tests_' + CIRCLE_BUILD_NUM
+        'build': 'build-' + buildId,
+        'tunnel-identifier': 'browsersolidity_tests_' + buildId
       }
     },
 
@@ -41,8 +41,8 @@ module.exports = {
         'browserName': 'chrome',
         'javascriptEnabled': true,
         'acceptSslCerts': true,
-        'build': 'build-' + CIRCLE_BUILD_NUM,
-        'tunnel-identifier': 'browsersolidity_tests_' + CIRCLE_BUILD_NUM,
+        'build': 'build-' + buildId,
+        'tunnel-identifier': 'browsersolidity_tests_' + buildId,
         'chromeOptions': {
           'args': ['window-size=2560,1440', 'start-fullscreen']
         }
@@ -56,8 +56,8 @@ module.exports = {
         'platform': 'OS X 10.11',
         'version': '10.0',
         'acceptSslCerts': true,
-        'build': 'build-' + CIRCLE_BUILD_NUM,
-        'tunnel-identifier': 'browsersolidity_tests_' + CIRCLE_BUILD_NUM
+        'build': 'build-' + buildId,
+        'tunnel-identifier': 'browsersolidity_tests_' + buildId
       }
     },
 
@@ -68,8 +68,8 @@ module.exports = {
         'platform': 'Windows 10',
         'acceptSslCerts': true,
         'version': '11.103',
-        'build': 'build-' + CIRCLE_BUILD_NUM,
-        'tunnel-identifier': 'browsersolidity_tests_' + CIRCLE_BUILD_NUM
+        'build': 'build-' + buildId,
+        'tunnel-identifier': 'browsersolidity_tests_' + buildId
       }
     },