diff --git a/.travis.yml b/.travis.yml
index ea684fd555..833428a0b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,79 +17,45 @@ env:
 jobs:
   include:
     - os: osx
-      env:
-        - BUILDSYSTEM=ninja
-    - env:
-      - os: linux
-      - DISTRO=Fedora28-mingw
-      - CI_BUILD_TYPE=mingw
-    - env:
-      - os: linux
-      - DISTRO=Fedora29
-      - CI_BUILD_TYPE=options-enabled
-    - env:
-      - os: linux
-      - DISTRO=Fedora29
-      - CI_BUILD_TYPE=options-disabled
-    - env:
-      - os: linux
-      - DISTRO=Fedora29
-      - CI_BUILD_TYPE=wayland
-    - env:
-      - os: linux
-      - DISTRO=Fedora29
-      - CI_BUILD_TYPE=default
-    - env:
-      - os: linux
-      - DISTRO=Fedora29
-      - CI_BUILD_TYPE=options-enabled
-      - BUILDSYSTEM=ninja
-    - env:
-      - os: linux
-      - DISTRO=Fedora29
-      - CI_BUILD_TYPE=options-disabled
-      - BUILDSYSTEM=ninja
-    - env:
-      - os: linux
-      - DISTRO=Fedora29
-      - CI_BUILD_TYPE=wayland
-      - BUILDSYSTEM=ninja
-    - env:
-      - os: linux
-      - DISTRO=Fedora29
-      - CI_BUILD_TYPE=default
-      - BUILDSYSTEM=ninja
+      env: BUILDSYSTEM=ninja
+    - os: linux
+      env: DISTRO=Fedora28-mingw CI_BUILD_TYPE=mingw
+    - os: linux
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=options-enabled
+    - os: linux
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=options-disabled
+    - os: linux
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=wayland
+    - os: linux
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=default
+    - os: linux
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=options-enabled BUILDSYSTEM=ninja
+    - os: linux
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=options-disabled BUILDSYSTEM=ninja
+    - os: linux
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=wayland BUILDSYSTEM=ninja
+    - os: linux
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=default BUILDSYSTEM=ninja
     - os: osx
       if: type = cron
-    - if: type = cron
-      env:
-        - os: linux
-        - DISTRO=Ubuntu1810
-    - if: type = cron
-      env:
-        - os: linux
-        - DISTRO=Fedora29
-        - CI_BUILD_TYPE=release-ready
-    - if: type = cron
-      env:
-        - os: linux
-        - DISTRO=Debian96
-    - if: type = cron
-      env:
-        - os: linux
-        - DISTRO=Ubuntu1810
-        - BUILDSYSTEM=ninja
-    - if: type = cron
-      env:
-        - os: linux
-        - DISTRO=Fedora29
-        - CI_BUILD_TYPE=release-ready
-        - BUILDSYSTEM=ninja
-    - if: type = cron
-      env:
-        - os: linux
-        - DISTRO=Debian96
-        - BUILDSYSTEM=ninja
+    - os: linux
+      if: type = cron
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=release-ready
+    - os: linux
+      if: type = cron
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=release-ready BUILDSYSTEM=ninja
+    - os: linux
+      if: type = cron
+      env: DISTRO=Ubuntu1810
+    - os: linux
+      if: type = cron
+      env: DISTRO=Debian96
+    - os: linux
+      if: type = cron
+      env: DISTRO=Ubuntu1810 BUILDSYSTEM=ninja
+    - os: linux
+      if: type = cron
+      env: DISTRO=Debian96 BUILDSYSTEM=ninja
 
 services:
   - docker