diff --git a/.travis.yml b/.travis.yml
index 4a1de9e77..4cd1f75f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,6 @@ before_install:
 install:
 - export BOOST_DIR=$HOME/boost_1_63_0
 - export SLIC3R_STATIC=1
-- export CXX=g++-7
-- export CC=gcc-7
 script:
 - bash package/linux/travis-setup.sh
 - cmake -DBOOST_ROOT=$BOOST_DIR src/
diff --git a/package/linux/travis-setup.sh b/package/linux/travis-setup.sh
index f0e1b0906..fc8b83756 100755
--- a/package/linux/travis-setup.sh
+++ b/package/linux/travis-setup.sh
@@ -13,6 +13,11 @@ if [ $TRAVIS_OS_NAME == "linux" ]; then
         echo "Downloading http://www.siusgs.com/slic3r/buildserver/wx${WXVERSION}-libs.tar.bz2 => $CACHE/wx${WXVERSION}.tar.bz2"
         curl -L "http://www.siusgs.com/slic3r/buildserver/wx${WXVERSION}-libs.tar.bz2" -o $CACHE/wx${WXVERSION}.tar.bz2
     fi
-tar -C$HOME -xjf $CACHE/boost-compiled.tar.bz2
-tar -C$HOME -xjf $CACHE/wx${WXVERSION}.tar.bz2
+    
+    tar -C$HOME -xjf $CACHE/boost-compiled.tar.bz2
+    tar -C$HOME -xjf $CACHE/wx${WXVERSION}.tar.bz2
+
+    # Set some env variables specific to Travis Linux
+    export CXX=g++-7
+    export CC=gcc-7
 fi