diff --git a/.travis.yml b/.travis.yml
index c104147..712e200 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,6 +73,30 @@
         "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
         "python": "3.8"
       },
+      {
+        "env": "BUILD=test REQUIREMENTS=release",
+        "python": "3.9"
+      },
+      {
+        "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=release ",
+        "python": "3.9"
+      },
+      {
+        "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
+        "python": "3.9"
+      },
+      {
+        "env": "BUILD=test REQUIREMENTS=minimal",
+        "python": "3.9"
+      },
+      {
+        "env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=minimal ",
+        "python": "3.9"
+      },
+      {
+        "env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
+        "python": "3.9"
+      },
       {
         "env": "BUILD=test ETESYNC_TESTS=true REQUIREMENTS=latest",
         "python": "3.7"
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 7c790e5..49fb0ce 100755
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -2,7 +2,7 @@
 import itertools
 import json
 
-python_versions = ["3.7", "3.8"]
+python_versions = ["3.7", "3.8", "3.9"]
 
 cfg = {}
 
diff --git a/setup.py b/setup.py
index d584b95..e8dd9c0 100644
--- a/setup.py
+++ b/setup.py
@@ -89,6 +89,7 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Topic :: Internet',
         'Topic :: Utilities',
     ],