diff --git a/.travis.yml b/.travis.yml
index e9cbc4c3b..931e58835 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@ before_install:
   - touch temp.cpp ; g++ -E -dM -c temp.cpp | sort ; rm -rf temp.cpp
   - yes yes | sudo cpan -fi Unix::Processors Parallel::Forker
   - sudo apt-get install gdb gtkwave
+  - sudo apt-get install libfl-dev || true
   - sudo apt-get install libgoogle-perftools-dev
 before_script:
   - bash -x ci/build_vcddiff.sh
@@ -42,142 +43,75 @@ stages:
   - test
 
 jobs:
+#                          compiler: gcc  clang
+#     12.04 dist: precise  perl problem
+#     14.04 dist: trusty   cron
+#     16.04 dist: xenial   cron           cron
+#     18.04 dist: bionic   cron
+#     20.04 dist: focal    !cron          cron
   include:
     - if: type != cron
       stage: "Build Verilator"
-      name: Build Verilator
+      name: "Build Verilator"
+      dist: focal
       compiler: gcc
       script: echo "Done building Verilator"
 # Non-cron build will just run on whatever linux flavor we get
     - if: type != cron
       stage: test
-      name: Dist test
+      name: "Dist test"
+      dist: focal
       compiler: gcc
       script: ci/test.sh dist
     - if: type != cron
       stage: test
-      name: Vlt test
+      name: "Vlt test"
+      dist: focal
       compiler: gcc
       script: ci/test.sh vlt
     - if: type != cron
       stage: test
-      name: Vltmt set 0 test
+      name: "Vltmt set 0 test"
+      dist: focal
       compiler: gcc
       script: ci/test.sh vltmt0
     - if: type != cron
       stage: test
-      name: Vltmt set 1 test
+      name: "Vltmt set 1 test"
+      dist: focal
       compiler: gcc
       script: ci/test.sh vltmt1
 # Cron builds try different OS/compiler combinations
     - if: type = cron
+      dist: trusty
+      compiler: gcc
       stage: "Build Verilator"
-      name: Build xenial gcc Verilator
-      os: linux
+      name: "14.04 gcc build+test"
+      script: ci/test.sh all
+    - if: type = cron
       dist: xenial
       compiler: gcc
-      script: echo "Done building Verilator"
-    - if: type = cron
-      stage: test
-      name: Xenial gcc dist test
-      os: linux
-      dist: xenial
-      compiler: gcc
-      script: ci/test.sh dist
-    - if: type = cron
-      stage: test
-      name: Xenial gcc vlt test
-      os: linux
-      dist: xenial
-      compiler: gcc
-      script: ci/test.sh vlt
-    - if: type = cron
-      stage: test
-      name: Xenial gcc vltmt test
-      os: linux
-      dist: xenial
-      compiler: gcc
-      script: ci/test.sh vltmt
-    - if: type = cron
       stage: "Build Verilator"
-      name: Build xenial clang Verilator
-      os: linux
-      dist: xenial
-      compiler: clang
-      script: echo "Done building Verilator"
-    - if: type = cron
-      stage: test
-      name: Xenial clang dist test
-      os: linux
-      dist: xenial
-      compiler: clang
-      script: ci/test.sh dist
-    - if: type = cron
-      stage: test
-      name: Xenial clang vlt test
-      os: linux
-      dist: xenial
-      compiler: clang
-      script: ci/test.sh vlt
-    - if: type = cron
-      stage: test
-      name: Xenial clang vltmt test
-      os: linux
-      dist: xenial
-      compiler: clang
-      script: ci/test.sh vltmt
-#    - if: type = cron
-#      stage: "Build Verilator"
-#      name: Build OSX gcc Verilator
-#      os: osx
-#      compiler: gcc
-#      script: echo "Done building Verilator"
-#    - if: type = cron
-#      stage: test
-#      name: OSX gcc dist test
-#      os: osx
-#      compiler: gcc
-#      script: ci/test.sh dist
-#    - if: type = cron
-#      stage: test
-#      name: OSX gcc vlt test
-#      os: osx
-#      compiler: gcc
-#      script: ci/test.sh vlt
-#    - if: type = cron
-#      stage: test
-#      name: OSX gcc vltmt test
-#      os: osx
-#      compiler: gcc
-#      script: ci/test.sh vltmt
+      name: "16.04 gcc build+test"
+      script: ci/test.sh all
     - if: type = cron
+      dist: bionic
+      compiler: gcc
       stage: "Build Verilator"
-      name: Build trusty gcc Verilator
-      os: linux
-      dist: trusty
-      compiler: gcc
-      script: echo "Done building Verilator"
+      name: "18.04 gcc build+test"
+      script: ci/test.sh all
     - if: type = cron
-      stage: test
-      name: Trusty gcc dist test
-      os: linux
-      dist: trusty
-      compiler: gcc
-      script: ci/test.sh dist
+      dist: xenial
+      compiler: clang
+      stage: "Build Verilator"
+      name: "16.04 clang build+test"
+      script: ci/test.sh all
     - if: type = cron
-      stage: test
-      name: Trusty gcc vlt test
-      os: linux
-      dist: trusty
-      compiler: gcc
-      script: ci/test.sh vlt
-    - if: type = cron
-      stage: test
-      os: linux
-      dist: trusty
-      name: Trusty gcc vltmt test
-      compiler: gcc
-      script: ci/test.sh vltmt
+      dist: focal
+      compiler: clang
+      stage: "Build Verilator"
+      name: "20.04 clang build+test"
+      script: ci/test.sh all
 
 notifications:
   email: