diff --git a/.travis.yml b/.travis.yml
index bca24375..ba630fea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,4 @@
 ---
-before_install:
-- export DISPLAY=:99.0
-- sh -e /etc/init.d/xvfb start
-before_script:
-- test $USE_SAUCE == "true" && curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
 script: $TEST_COMMAND
 language: ruby
 rvm: 1.9.3
diff --git a/travis-core-script.sh b/travis-core-script.sh
index 0994a27b..5e133598 100644
--- a/travis-core-script.sh
+++ b/travis-core-script.sh
@@ -2,4 +2,11 @@
 
 export DISPLAY=:99.0
 
+/etc/init.d/xvfb start
+
+if [ $USE_SAUCE == true ]
+then
+    curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
+fi
+
 bundle exec rake core_spec