diff --git a/.travis.yml b/.travis.yml
index 73afa0244279574ab94e35d05a240d949bbea850..afb021c1954441e453753e631011813c1e5bb604 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,7 +68,7 @@ before_script:
     - $HOME/src/.travis/add_swap.sh
     - ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} configure
     - if [[ "x${TESTS}" != "xheadercheck" ]]; then ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} make; fi
-    - if [[ "x${TESTS}" != "xheadercheck" ]]; then travis_wait 50 ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja test_binaries_builder_${TESTS}; fi
+    - if [[ "x${TESTS}" != "xheadercheck" ]]; then travis_wait 50 ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -v test_binaries_builder_${TESTS}; fi
 
 script:
     - if [[ "x${TESTS}" != "xheadercheck" ]]; then travis_wait 50 ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ctest -j 2 -L "^builder_${TESTS}$"; fi
@@ -182,7 +182,16 @@ matrix:
       env: CC=gcc-5 TESTS=14 BLD=${DBG} CXX=g++-5
     - os: linux
       addons:  *gcc5
-      env: CC=gcc-5 TESTS=headercheck BLD=${DBG} CXX=g++-5
+      env: CC=gcc-5 TESTS=15 BLD=${DBG} CXX=g++-5
+    - os: linux
+      addons:  *gcc5
+      env: CC=gcc-5 TESTS=16 BLD=${DBG} CXX=g++-5
+    - os: linux
+      addons:  *gcc5
+      env: CC=gcc-5 TESTS=17 BLD=${DBG} CXX=g++-5
+    - os: linux
+      addons:  *gcc5
+      env: CC=gcc-5 TESTS=headercheck BLD=${DBG} CXX=g++-5 CLANG_FORMAT='/usr/bin/clang-format-3.8'
 
 #   clang 3.8
     - os: linux
@@ -235,7 +244,16 @@ matrix:
       env: CC=clang-3.8 TESTS=13 BLD=${DBG} CXX=clang++-3.8
     - os: linux
       addons:  *clang38
-      env: CC=clang-3.8 TESTS=14 BLD=${DBG} CXX=clang++-3.8 CLANG_FORMAT='/usr/bin/clang-format-3.8'
+      env: CC=clang-3.8 TESTS=14 BLD=${DBG} CXX=clang++-3.8
+    - os: linux
+      addons:  *clang38
+      env: CC=clang-3.8 TESTS=15 BLD=${DBG} CXX=clang++-3.8
+    - os: linux
+      addons:  *clang38
+      env: CC=clang-3.8 TESTS=16 BLD=${DBG} CXX=clang++-3.8
+    - os: linux
+      addons:  *clang38
+      env: CC=clang-3.8 TESTS=17 BLD=${DBG} CXX=clang++-3.8
     - os: linux
       addons:  *clang38
-      env: CC=clang-3.8 TESTS=headercheck BLD=${DBG} CXX=clang++-3.8
+      env: CC=clang-3.8 TESTS=headercheck BLD=${DBG} CXX=clang++-3.8 CLANG_FORMAT='/usr/bin/clang-format-3.8'
diff --git a/dune/gdt/test/CMakeLists.txt b/dune/gdt/test/CMakeLists.txt
index ea3c0bf405a6ea9964f7feb8920959a8bc44455a..4a7132d71f978f43dc175f8b105778072612b4ca 100644
--- a/dune/gdt/test/CMakeLists.txt
+++ b/dune/gdt/test/CMakeLists.txt
@@ -12,12 +12,12 @@ BEGIN_TESTCASES()
 
 END_TESTCASES()
 
-set(TRAVIS_BUILDER 15)
+set(DXT_TRAVIS_BUILDER 18)
 
 set(current_idx 0)
 
 foreach (target ${dxt_test_binaries})
-    math(EXPR list_idx "${current_idx} % ${TRAVIS_BUILDER}")
+    math(EXPR list_idx "${current_idx} % ${DXT_TRAVIS_BUILDER}")
     list(APPEND test_names_numbered_${list_idx} ${target})
     foreach(testname ${dxt_test_names_${target}})
         set_tests_properties(${testname} PROPERTIES LABELS "builder_${list_idx}")
@@ -25,7 +25,7 @@ foreach (target ${dxt_test_binaries})
     MATH(EXPR current_idx "${current_idx}+1")
 endforeach (target ${dxt_test_binaries})
 
-MATH(EXPR max_idx "${TRAVIS_BUILDER}-1")
+MATH(EXPR max_idx "${DXT_TRAVIS_BUILDER}-1")
 foreach(idx RANGE 0 ${max_idx} 1)
     add_custom_target(test_binaries_builder_${idx} DEPENDS ${test_names_numbered_${idx}})
 endforeach(idx RANGE 0 ${max_idx} 1)