diff --git a/.travis.yml b/.travis.yml
index 3c17c888..d716f0cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: cpp
-
+sudo: required
 compiler:
   - gcc
 
@@ -10,12 +10,6 @@ install:
   - sudo apt-get -y install autotools-dev automake autoconf autoconf-archive libtool libglib2.0-dev libncurses5-dev libgpm-dev gperf
   - git clone git://github.com/gansm/finalcut.git
   - cd finalcut
-  - autoreconf -v --install --force
-  - ./configure --prefix=/usr
-  - make V=1 -j10
-  - sudo make install
-  - cd ..
-  - rm -rf finalcut
 
 env:
   global:
@@ -23,20 +17,23 @@ env:
    #   via the "travis encrypt" command using the project repo's public key
    - secure: "HzE/Yc8AWHTnZYFIfgKI9uFLlrKBw8L7cucRRYGzVyS1YGijjuchIeFxl4ahUCW6/pwvj4Wh9JUL1pOm+mB89XRSMSCGXN7gkFA73DB1Eq/oNdoDQbzKJeMYEP+WhPUuwTGClukRsjN48v35Nc2DJ4bGwasOjwOElZZKgNe/XrF7ok9eI1atcIl4BaxjnjNIyG9A1+MKhjUkT+FnPuqjXXz02RWD7E0IC94CK665LjdDZsnsRGf3sKBr1ZyI4uQmFmZ8W/7DxSsW1xkhtTOyY+QxQ8+CqSfiBgREwU2bPQuM/rAdAISvLk+1zMOja60B2YHTNreVi4Jj0FAQUKto9feC2QZTTrX+jv6NQEyH4XilMak9vBHKpCb6MFhHgDO4puXTur1OzGY1dtHQeQ72Ap2aAy0pPJruqeYzd9K80cSTDhqcOywt+dwja7lrPEVhqltKXFXSviLj6531to1PQBVi+Uw3uMbdo1twtkvW0SRgqq2h8OzD6SWsdI63nurQxK0qpGFnE2/N5pWxOHud6Me8G6ZBYeTRNKMrHroGoKrUr4CwgB80SKR0qj7Yga3HnJLkKwEUmRnK1gA2MD/td8IT4QAf10VI7J5P1rullZ7zK0eVnE+bHHgyd5XJkgspaXezYVPPh2hNLwREXztU3DfQgrzwjuQ4aBEGiYgcGMU="
 
-addons:
-  coverity_scan:
-    project:
-      name: "gansm/finalcut"
-      description: "Build submitted via Travis CI"
-    notification_email: guru.mail@muenster.de
-    build_command_prepend: "autoreconf -v --install --force && ./configure --prefix=/usr && make clean"
-    build_command:   "make -j10"
-    branch_pattern: master
-
-script:
-  - autoreconf -v --install --force && ./configure --prefix=/usr && make -j10 && make check
-
-sudo: required
+matrix:
+  include:
+  #
+  # Coverity Scan
+  #
+  - os: linux
+    env:
+      - TEST="Coverity Scan"
+    addons:
+      coverity_scan:
+        project:
+          name: "gansm/finalcut"
+          description: "Build submitted via Travis CI"
+        notification_email: guru.mail@muenster.de
+        build_command_prepend: "autoreconf -v --install --force && ./configure --prefix=/usr && make clean"
+        build_command: "make V=1 -j10"
+        branch_pattern: master
 
   #
   # Coveralls
diff --git a/ChangeLog b/ChangeLog
index 2e3f7d91..93bdf171 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-11-11  Markus Gans  <guru.mail@muenster.de>
+	* Improved code coverage tests
+
 2017-11-08  Markus Gans  <guru.mail@muenster.de>
 	* Simulate invisible characters on terminals that do not 
 	  support this attribute