diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cf002457c..9596daf98 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -53,8 +53,8 @@ jobs:
           python: 3.8
           allow_failure: false
 
-        - name: py38-dj31-postgres-xdist-coverage
-          python: 3.8
+        - name: py39-dj31-postgres-xdist-coverage
+          python: 3.9
           allow_failure: false
 
         - name: py37-dj30-mysql_innodb-coverage
@@ -77,8 +77,8 @@ jobs:
           python: 3.8
           allow_failure: false
 
-        - name: py38-djmaster-sqlite-coverage
-          python: 3.8
+        - name: py39-djmaster-sqlite-coverage
+          python: 3.9
           allow_failure: true
 
         # Explicitly test (older) pytest 5.4.
diff --git a/setup.cfg b/setup.cfg
index fd2f3b4d9..9c22c6efa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,6 +24,7 @@ classifiers =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
     Topic :: Software Development :: Testing
diff --git a/tox.ini b/tox.ini
index c24da8e9e..aa7ee4731 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
 envlist =
+    py39-dj{31,30,22}-postgres
     py38-dj{31,30,22}-postgres
     py37-dj{31,30,22}-postgres
     py36-dj{31,30,22}-postgres