diff --git a/.travis.yml b/.travis.yml
index 58cbe36f2dd..5f5e92864e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ before_install:
   - ./run-first
 
 script:
-  - npm test && grunt saucelabs && ./travis.sh
+  - npm test && ./travis.sh
 
 notifications:
   irc:
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 94ea1c40ab4..4969b5f0e90 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -329,16 +329,19 @@ module.exports = (grunt) ->
 				csv: "src/i18n/i18n.csv"
 			src: "src/js/i18n/formvalid/*.js"
 
-		'saucelabs-mocha': 
-            all: 
-                options: 
-                    urls: ["http://127.0.0.1:8000/dist/demo/carousel/carousel-en.html"]
-                    tunnelTimeout: 5
-                    build: process.env.TRAVIS_BUILD_NUMBER
-                    concurrency: 3
-                    browsers: grunt.file.readJSON("browsers.json")
-                    testname: "WET-BOEW Travis Build #{process.env.TRAVIS_BUILD_NUMBER}"
-                    tags: [process.env.TRAVIS_BRANCH, process.env.TRAVIS_COMMIT]
+		"saucelabs-mocha": 
+			all: 
+				options: 
+					urls: ["http://127.0.0.1:8000/dist/demo/carousel/carousel-en.html"]
+					tunnelTimeout: 5
+					build: process.env.TRAVIS_BUILD_NUMBER
+					concurrency: 3
+					browsers: grunt.file.readJSON "browsers.json"
+					testname: "WET-BOEW Travis Build #{process.env.TRAVIS_BUILD_NUMBER}"
+					tags: [
+						process.env.TRAVIS_BRANCH,
+						process.env.TRAVIS_COMMIT
+					]
  
 		"gh-pages":
 			options:
diff --git a/travis.sh b/travis.sh
index 58c09a1e6a4..06846e67ead 100755
--- a/travis.sh
+++ b/travis.sh
@@ -8,7 +8,11 @@ function error_exit
 	exit 1
 }
 
-if [ "$TRAVIS_PULL_REQUEST" == "false" ] &&  [ "$TRAVIS_REPO_SLUG" == "wet-boew/wet-boew" ] && [ "$TRAVIS_BRANCH" == "v4.0" ]; then
+if [ "$TRAVIS_SECURE_ENV_VARS" == "true" ] && [ "$TRAVIS_REPO_SLUG" == "wet-boew/wet-boew" ];  then
+	grunt saucelabs || error_exit "Error running Sauce tests";
+fi
+
+if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_REPO_SLUG" == "wet-boew/wet-boew" ] && [ "$TRAVIS_BRANCH" == "v4.0" ]; then
 
 	#Set git user
 	git config --global user.email "wet.boew.bot@gmail.com"