diff --git a/.travis.yml b/.travis.yml
index 8b1518d3f..ef0a945a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,25 +14,25 @@ addons:
     sources:
       - sourceline: 'ppa:openmw/openmw'
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-7
+      - llvm-toolchain-xenial-7
     packages: [
       # Dev
-      cmake, clang-7, clang-tools-7, gcc-5, g++-5,
+      cmake, clang-7, clang-tools-7, gcc-8, g++-8,
       # Boost
       libboost-filesystem-dev, libboost-program-options-dev, libboost-system-dev,
       # FFmpeg
-      libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev,
+      libavcodec-dev, libavformat-dev, libavutil-dev, libswresample-dev, libswscale-dev,
       # Audio, Video and Misc. deps
-      libsdl2-dev, libqt4-dev, libopenal-dev, libunshield-dev, libtinyxml-dev,
+      libsdl2-dev, libqt5opengl5-dev, libopenal-dev, libunshield-dev, libtinyxml-dev,
       # The other ones from OpenMW ppa
-      libbullet-dev, libswresample-dev, libopenscenegraph-3.4-dev, libmygui-dev
+      libbullet-dev, libopenscenegraph-3.4-dev, libmygui-dev
     ]
-  coverity_scan:
+  coverity_scan:  # TODO: currently takes too long, disabled openmw/openmw-cs for now.
     project:
       name: "OpenMW/openmw"
       description: "<Your project description here>"
     branch_pattern: coverity_scan
-    notification_email: 720642+scrawl@users.noreply.github.com
+    notification_email: 1122069+psi29a@users.noreply.github.com
     build_command_prepend: "cov-configure --comptype gcc --compiler gcc-5 --template; cmake . -DBUILD_OPENMW=FALSE -DBUILD_OPENCS=FALSE"
     build_command: "make VERBOSE=1 -j3"
 matrix:
@@ -41,16 +41,21 @@ matrix:
       os: osx
       osx_image: xcode9.4
       if: branch != coverity_scan
-    - name: OpenMW (all) on Ubuntu Trusty GCC-5
+    - name: OpenMW (all) on Ubuntu Xenial GCC-5
       os: linux
-      dist: trusty
+      dist: xenial
+      sudo: required
+      if: branch != coverity_scan
+    - name: OpenMW (all) on Ubuntu Xenial GCC-8
+      os: linux
+      dist: xenial
       sudo: required
       env:
-        - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
       if: branch != coverity_scan
-    - name: OpenMW (openmw) on Ubuntu Trusty Clang-7 with Static Analysis
+    - name: OpenMW (openmw) on Ubuntu Xenial Clang-7 with Static Analysis
       os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       env:
         - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
@@ -58,25 +63,23 @@ matrix:
         - BUILD_OPENMW_CS="OFF"
       if: branch != coverity_scan
       compiler: clang
-    - name: OpenMW (openmw-cs) on Ubuntu Trusty Clang-7 with Static Analysis
+    - name: OpenMW (openmw-cs) on Ubuntu Xenial Clang-7 with Static Analysis
       os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       env:
-      - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
-      - ANALYZE="scan-build-7 --force-analyze-debug-code --use-cc clang-7 --use-c++ clang++-7"
-      - BUILD_OPENMW="OFF"
+        - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
+        - ANALYZE="scan-build-7 --force-analyze-debug-code --use-cc clang-7 --use-c++ clang++-7"
+        - BUILD_OPENMW="OFF"
       if: branch != coverity_scan
       compiler: clang
-    - name: OpenMW Coverity Scan
+    - name: OpenMW Components Coverity Scan
       os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
-      env:
-      - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
       if: branch = coverity_scan
 #   allow_failures:
-#    - name: OpenMW (openmw) on Ubuntu Trusty Clang-7 with Static Analysis
+#    - name: OpenMW (openmw) on Ubuntu Xenial Clang-7 with Static Analysis
 
 before_install:
     - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then eval "${MATRIX_EVAL}"; fi
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index c8c4f8f85..3ce005874 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -26,6 +26,8 @@ ${ANALYZE} cmake \
     -DBUILD_MYGUI_PLUGIN=${BUILD_OPENMW_CS} \
     -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} \
     -DBUILD_UNITTESTS=1 \
+    -DUSE_SYSTEM_TINYXML=1 \
+    -DDESIRED_QT_VERSION=5 \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBINDIR=/usr/games \
     -DCMAKE_BUILD_TYPE="None" \