diff --git a/.travis.yml b/.travis.yml
index c93795241..89b5317a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,7 @@ env:
    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
    #   via the "travis encrypt" command using the project repo's public key
    - secure: "jybGzAdUbqt9vWR/GEnRd96BgAi/7Zd1+2HK68j/i/8+/1YH2XxLOy4Jv/DUBhBlJIkxs/Xv8dRcUlFOclZDHX1d/9Qnsqd3oUVkD7k1y7cTOWy9TBQaE/v/kZo3LpzA3xPwwthrb0BvqIbOfIELi5fS5s8ba85WFRg3AX70wWE="
-cache:
-  ccache: true
-  directories:
-  - ${HOME}/.ccache
+cache: ccache
 addons:
   apt:
     sources:
@@ -89,6 +86,7 @@ before_install:
     - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then eval "${MATRIX_EVAL}"; fi
     - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./CI/before_install.${TRAVIS_OS_NAME}.sh; fi
 before_script:
+    - ccache -z
     - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./CI/before_script.${TRAVIS_OS_NAME}.sh; fi
 script:
  - cd ./build
@@ -98,6 +96,7 @@ script:
  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi
  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi
  - cd "${TRAVIS_BUILD_DIR}"
+ - ccache -s
 deploy:
  provider: script
  script: ./CI/deploy.osx.sh
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 250955e49..c9b5b55bf 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -7,9 +7,7 @@ GOOGLETEST_DIR="$(pwd)/googletest/build"
 
 mkdir build
 cd build
-export CODE_COVERAGE=1
 
-if [[ "${CC}" =~ "clang" ]]; then export CODE_COVERAGE=0; fi
 if [[ -z "${BUILD_OPENMW}" ]]; then export BUILD_OPENMW=ON; fi
 if [[ -z "${BUILD_OPENMW_CS}" ]]; then export BUILD_OPENMW_CS=ON; fi
 
@@ -28,7 +26,6 @@ ${ANALYZE} cmake \
     -DBUILD_WIZARD=${BUILD_OPENMW_CS} \
     -DBUILD_NIFTEST=${BUILD_OPENMW_CS} \
     -DBUILD_MYGUI_PLUGIN=${BUILD_OPENMW_CS} \
-    -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} \
     -DBUILD_UNITTESTS=1 \
     -DUSE_SYSTEM_TINYXML=1 \
     -DDESIRED_QT_VERSION=5 \