diff --git a/.travis.yml b/.travis.yml
index 276029c5e..a364e37e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,15 +27,6 @@ addons:
       # The other ones from OpenMW ppa
       libbullet-dev, libswresample-dev, libopenscenegraph-3.4-dev, libmygui-dev
     ]
-
-  coverity_scan:
-    project:
-      name: "OpenMW/openmw"
-      description: "<Your project description here>"
-    notification_email: 720642+scrawl@users.noreply.github.com
-    build_command_prepend: "cmake . -DBUILD_UNITTESTS=FALSE -DBUILD_OPENCS=FALSE -DBUILD_BSATOOL=FALSE -DBUILD_ESMTOOL=FALSE -DBUILD_LAUNCHER=FALSE -DBUILD_MWINIIMPORTER=FALSE -DBUILD_WIZARD=FALSE"
-    build_command:   "make -j3"
-    branch_pattern: coverity_scan
 matrix:
   include:
     - name: OpenMW (all) on MacOS xcode9.4
@@ -65,20 +56,34 @@ matrix:
       - ANALYZE="scan-build-7 --use-cc clang-7 --use-c++ clang++-7"
       - BUILD_OPENMW="OFF"
       compiler: clang
+    - name: OpenMW Coverity Scan
+      os: linux
+      dist: trusty
+      sudo: required
+      coverity_scan:
+        project:
+          name: "OpenMW/openmw"
+          description: "<Your project description here>"
+        branch_pattern: coverity_scan
+        notification_email: 720642+scrawl@users.noreply.github.com
+        build_command_prepend:
+        - "cov-configure --comptype gcc --compiler gcc-8 --template"
+        - "cmake . -DBUILD_OPENCS=FALSE -DBUILD_WIZARD=FALSE -DBUILD_UNITTESTS=FALSE -DBUILD_BSATOOL=FALSE -DBUILD_ESMTOOL=FALSE -DBUILD_MWINIIMPORTER=FALSE -DBUILD_ESSIMPORTER=FALSE -DBUILD_LAUNCHER=FALSE -DBUILD_MYGUI_PLUGIN=FALSE"
+        build_command: "make VERBOSE=1 -j3"
 #   allow_failures:
 #    - name: OpenMW (openmw) on Ubuntu Trusty Clang-7 with Static Analysis
 
 before_install:
     - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then eval "${MATRIX_EVAL}"; fi
-    - ./CI/before_install.${TRAVIS_OS_NAME}.sh
+    - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./CI/before_install.${TRAVIS_OS_NAME}.sh; fi
 before_script:
-    - ./CI/before_script.${TRAVIS_OS_NAME}.sh
+    - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./CI/before_script.${TRAVIS_OS_NAME}.sh; fi
 script:
  - cd ./build
- - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then ${ANALYZE} make -j3; fi
- - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
- - 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
+ - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ${ANALYZE} make -j3; fi
+ - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
+ - 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}"
 deploy:
  provider: script