diff --git a/.travis.yml b/.travis.yml
index 224d5d13be8fa67317a2592981f070094d66d815..36d6b1553823da74a4f60e6db3efb602e0f3ebbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,20 +43,23 @@ script:
     - make -s -C ./examples/default info-concurrency
     - git rebase riot/master || git rebase --abort
 
-    - ./dist/tools/compile_test/compile_test.py
-    - make -C ./tests/unittests test BOARD=native
-    - make -C ./tests/unittests test BOARD=qemu-i386
     - ./dist/tools/licenses/check.sh master
 # TODO:
+#   Remove the `AC` argument when all headers have been
+#   taken care of in master.
+    - ./dist/tools/externc/check.sh master AC
+
+# TODO:
 #   Remove all but `master` parameters to cppcheck (and remove second
 #   invocation) once all warnings of cppcheck have been taken care of
 #   in master.
     - ./dist/tools/cppcheck/check.sh master --diff-filter=MR --error-exitcode=0
     - ./dist/tools/cppcheck/check.sh master --diff-filter=AC
-# TODO:
-#   Remove the `AC` argument when all headers have been
-#   taken care of in master.
-    - ./dist/tools/externc/check.sh master AC
+
+    - make -C ./tests/unittests all test BOARD=native
+    - make -C ./tests/unittests all test BOARD=qemu-i386
+
+    - ./dist/tools/compile_test/compile_test.py
 
 notifications:
     email: false