diff --git a/.travis.yml b/.travis.yml
index 6010d99..1c68ac7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,13 @@ node_js:
 sudo: false
 
 before_install:
+  # Skip SauceLabs tests in Pull Request
+  - |
+    if [[ $TRAVIS_SECURE_ENV_VARS == "false"  ]] && [[ $CLIENT == saucelabs:* ]]; then
+      echo "Not running test, cannot connect to SauceLabs in Pull Request"
+      travis_terminate 0
+    fi
+
   # Install PhantomJS and cache it
   # See https://github.com/Medium/phantomjs#continuous-integration
   - "export PHANTOMJS_VERSION=2.1.1"
diff --git a/bin/run-test.js b/bin/run-test.js
index b1fb2ae..245bc1e 100644
--- a/bin/run-test.js
+++ b/bin/run-test.js
@@ -66,15 +66,14 @@ function buildKarmaConf(client) {
       platform: tmp[3] || null,
     };
 
-    if (process.env.TRAVIS &&
-      client.runner === 'saucelabs' &&
-      process.env.TRAVIS_SECURE_ENV_VARS === 'false') {
-      console.error('Not running test, cannot connect to saucelabs');
-      return null;
-    }
-
     if (client.runner === 'saucelabs') {
 
+      // This should already be handled in .travis.yml
+      if (process.env.TRAVIS && process.env.TRAVIS_SECURE_ENV_VARS === 'false') {
+        console.error('Not running test, cannot connect to SauceLabs in Pull Request');
+        return null;
+      }
+
       // Standard SauceLabs configuration
       options.sauceLabs = {
         testName: 'pouchdb-authentication tests',