diff --git a/.zuul.yaml b/.zuul.yaml
index 23102f9eb..d723699bb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -19,10 +19,9 @@
         - openstack-tox-functional-py36
         - openstack-tox-functional-py37
         - openstack-tox-functional-py38
-        - openstack-tox-functional-py39:
-            voting: false
+        - openstack-tox-functional-py39
         - openstack-tox-pep8
-        - placement-nova-tox-functional-py38
+        - placement-nova-tox-functional-py39
         - placement-nested-perfload:
             voting: false
         - placement-perfload:
@@ -53,8 +52,9 @@
         - openstack-tox-functional-py36
         - openstack-tox-functional-py37
         - openstack-tox-functional-py38
+        - openstack-tox-functional-py39
         - openstack-tox-pep8
-        - placement-nova-tox-functional-py38
+        - placement-nova-tox-functional-py39
         - tempest-integrated-placement:
             irrelevant-files: *gate-irrelevant-files
         - grenade:
@@ -67,14 +67,14 @@
         # we only test the latest version in the periodics as its just a signal
         # that we need to investigate the healt of the master branch in the absence
         # of frequent patches.
-        - openstack-tox-functional-py38
-        - openstack-tox-py38
-        - placement-nova-tox-functional-py38
+        - openstack-tox-functional-py39
+        - openstack-tox-py39
+        - placement-nova-tox-functional-py39
         - tempest-integrated-placement
 
 - job:
-    name: placement-nova-tox-functional-py38
-    parent: nova-tox-functional-py38
+    name: placement-nova-tox-functional-py39
+    parent: nova-tox-functional-py39
     description: |
         Run the nova functional tests to confirm that we aren't breaking
         the PlacementFixture.
diff --git a/setup.cfg b/setup.cfg
index b3f6d7221..ef732ea7a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,6 +26,7 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 6db14c711..1a11c30cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.1.1
-envlist = py38,functional-py38,pep8
+envlist = py39,functional-py39,pep8
 skipsdist = True
 # Automatic envs (pyXX) will use the python version appropriate to that
 # env and ignore basepython inherited from [testenv]. That's what we