diff --git a/.travis.yml b/.travis.yml
index f538aeb..e12bc0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@
     ]
   },
   "cache": "pip",
-  "dist": "trusty",
+  "dist": "bionic",
   "git": {
     "submodules": false
   },
@@ -26,10 +26,12 @@
         "python": "3.5"
       },
       {
+        "dist": "trusty",
         "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=release ",
         "python": "3.5"
       },
       {
+        "dist": "trusty",
         "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
         "python": "3.5"
       },
@@ -38,10 +40,12 @@
         "python": "3.5"
       },
       {
+        "dist": "trusty",
         "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=minimal ",
         "python": "3.5"
       },
       {
+        "dist": "trusty",
         "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
         "python": "3.5"
       },
@@ -74,6 +78,54 @@
         "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
         "python": "3.6"
       },
+      {
+        "env": "BUILD=test REQUIREMENTS=release",
+        "python": "3.7"
+      },
+      {
+        "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=release ",
+        "python": "3.7"
+      },
+      {
+        "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
+        "python": "3.7"
+      },
+      {
+        "env": "BUILD=test REQUIREMENTS=minimal",
+        "python": "3.7"
+      },
+      {
+        "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=minimal ",
+        "python": "3.7"
+      },
+      {
+        "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
+        "python": "3.7"
+      },
+      {
+        "env": "BUILD=test REQUIREMENTS=release",
+        "python": "3.8"
+      },
+      {
+        "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=release ",
+        "python": "3.8"
+      },
+      {
+        "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
+        "python": "3.8"
+      },
+      {
+        "env": "BUILD=test REQUIREMENTS=minimal",
+        "python": "3.8"
+      },
+      {
+        "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=minimal ",
+        "python": "3.8"
+      },
+      {
+        "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
+        "python": "3.8"
+      },
       {
         "env": "BUILD=test ETESYNC_TESTS=true REQUIREMENTS=latest",
         "python": "3.6"
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 03169fd..07f4342 100755
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -3,13 +3,13 @@
 import itertools
 import json
 
-python_versions = ("3.5", "3.6")
+python_versions = ("3.5", "3.6", "3.7", "3.8")
 latest_python = "3.6"
 
 cfg = {}
 
 cfg['sudo'] = True
-cfg['dist'] = 'trusty'
+cfg['dist'] = 'bionic'
 cfg['language'] = 'python'
 cfg['cache'] = 'pip'
 
@@ -61,6 +61,8 @@ for python, requirements in itertools.product(
                     f"DAV_SERVER={dav_server} "
                     f"REQUIREMENTS={requirements} ")
         }
+        if python == '3.5':
+            job['dist'] = 'trusty'
 
         build_prs = dav_server not in ("fastmail", "davical", "icloud")
         if not build_prs: