diff --git a/.travis.yml b/.travis.yml
index cdcee91cc..32dd43e81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: cpp
-dist: trusty
+dist: xenial
 compiler:
     - clang
     - gcc
@@ -34,7 +34,11 @@ before_install:
           fi;
           sudo apt-get install -y libobjc-4.8-dev;
         else
-          sudo apt-get install -y libkqueue-dev libpthread-workqueue-dev;
+          curl -s -o - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -;
+          sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main" && sudo apt-get update -qq;
+          sudo apt-get install -y clang-9 libkqueue-dev libpthread-workqueue-dev;
+          export CC=clang-9;
+          export CXX=clang++-9;
         fi;
 install: ./travis-deps.sh
 before_script: >
@@ -50,5 +54,5 @@ before_script: >
     export GNUSTEP_MAKEFILES=$HOME/staging/share/GNUstep/Makefiles;
     . $HOME/staging/share/GNUstep/Makefiles/GNUstep.sh;
 script: >
-    ./configure $BASE_ABI;
+    ./configure $BASE_ABI || (cat config.log && false);
     make && make install && make check || (cat Tests/tests.log && false);