diff --git a/.zuul.d/cross-jobs.yaml b/.zuul.d/cross-jobs.yaml
index 23ff3272af..b6341b31b5 100644
--- a/.zuul.d/cross-jobs.yaml
+++ b/.zuul.d/cross-jobs.yaml
@@ -11,7 +11,7 @@
 
 - job:
     name: horizon-cross-manila-ui-python
-    parent: openstack-tox-py38
+    parent: openstack-tox-py39
     vars:
       zuul_work_dir: "{{ zuul.projects['opendev.org/openstack/manila-ui'].src_dir }}"
     required-projects:
@@ -28,7 +28,7 @@
 
 - job:
     name: horizon-cross-heat-dashboard-python
-    parent: openstack-tox-py38
+    parent: openstack-tox-py39
     vars:
       zuul_work_dir: "{{ zuul.projects['opendev.org/openstack/heat-dashboard'].src_dir }}"
     required-projects:
diff --git a/setup.cfg b/setup.cfg
index dfc82f6949..bcdd5b606c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,6 +21,7 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Topic :: Internet :: WWW/HTTP
 
 [global]
diff --git a/tox.ini b/tox.ini
index 4e6e7dc3d4..86acfc98be 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.1
-envlist = pep8,py36,py38,releasenotes,npm,py3-dj32
+envlist = pep8,py36,py39,releasenotes,npm,py3-dj32
 skipsdist = True
 # Automatic envs (pyXX) will only use the python version appropriate to that
 # env and ignore basepython inherited from [testenv] if we set