diff --git a/.travis.yml b/.travis.yml
index 9c0eb1e61..4e6f92891 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,9 +50,6 @@ matrix:
     - os: linux
       env:
         ANALYZE="scan-build-3.6 --use-cc clang-3.6 --use-c++ clang++-3.6 "
-        COMPILER_NAME=gcc
-        CXX=g++-6
-        CC=gcc-6
       compiler: clang
   allow_failures:
     - env: ANALYZE="scan-build-3.6 --use-cc clang-3.6 --use-c++ clang++-3.6 "
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 52be990fa..9347e7be9 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -6,5 +6,10 @@ cd build
 export CODE_COVERAGE=1
 export RAKNET_ROOT=~/RakNet
 export Terra_ROOT=~/terra-Linux-x86_64-332a506
-if [ "${CC}" = "clang" ]; then export CODE_COVERAGE=0; fi
+if [ "${CC}" = "clang" ]; then export CODE_COVERAGE=0; 
+else 
+    export COMPILER_NAME=gcc
+    export CXX=g++-6
+    export CC=gcc-6
+fi
 ${ANALYZE}cmake .. -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} -DBUILD_BSATOOL=OFF -DBUILD_ESMTOOL=OFF -DBUILD_ESSIMPORTER=OFF -DBUILD_LAUNCHER=OFF -DBUILD_MWINIIMPORTER=OFF -DBUILD_MYGUI_PLUGIN=OFF -DBUILD_OPENCS=OFF -DBUILD_WIZARD=OFF -DBUILD_UNITTESTS=1 -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=/usr/games  -DCMAKE_BUILD_TYPE="None" -DUSE_SYSTEM_TINYXML=TRUE -DRakNet_LIBRARY_RELEASE=~/RakNet/lib/libRakNetLibStatic.a -DRakNet_LIBRARY_DEBUG=~/RakNet/lib/libRakNetLibStatic.a