diff --git a/.travis.yml b/.travis.yml
index 797d91dd..58edb5f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,14 @@ addons:
     packages:
       - g++-4.9
       - g++-5
+  coverity_scan:
+    project:
+      name: "ChaiScript/ChaiScript"
+      description: "Build submitted via Travis CI"
+    notification_email: jason@emptycrate.com
+    build_command_prepend: "cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug . "
+    build_command:   "cmake --build . -- -j2"
+    branch_pattern: coverity_scan
       
 matrix:
   include:
@@ -17,11 +25,7 @@ matrix:
       compiler: gcc
     - os: linux
       sudo: false
-      env: 
-        - GCC_VER="5"
-        - CPPCHECK=1
-        - COVERAGE=1
-        - FUZZY_CMD="-D RUN_FUZZY_TESTS:BOOL=TRUE"
+      env: GCC_VER="5"
       compiler: gcc
     - os: osx
       compiler: clang
@@ -35,6 +39,7 @@ env:
 
 before_install:
   - if [ "${GCC_VER}" != "" ]; then export CXX="g++-$GCC_VER" CC="gcc-$GCC_VER" GCOV="gcov-$GCC_VER" ; fi
+  - if [ "${GCC_VER}" == "5" ]; then export CPPCHECK=1 COVERAGE=1 FUZZY_CMD="-D RUN_FUZZY_TESTS:BOOL=TRUE" ; fi
   - pip install --user cpp-coveralls
 
 script: 
@@ -59,15 +64,3 @@ notifications:
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
     on_start: false     # default: false
-
-addons:
-  coverity_scan:
-    project:
-      name: "ChaiScript/ChaiScript"
-      description: "Build submitted via Travis CI"
-    notification_email: jason@emptycrate.com
-    build_command_prepend: "cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug . "
-    build_command:   "cmake --build . -- -j2"
-    branch_pattern: coverity_scan
-
-