diff --git a/.zuul.yaml b/.zuul.yaml
index aa3e73857..7dfb270c9 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -271,6 +271,14 @@
     pre-run: playbooks/nodepool-tox/pre.yaml
     vars: *nodepool_tox_vars
 
+- job:
+    name: nodepool-tox-py39
+    description: |
+      Nodepool unit tests with ZooKeeper running
+    parent: tox-py39
+    pre-run: playbooks/nodepool-tox/pre.yaml
+    vars: *nodepool_tox_vars
+
 - project:
     vars:
       release_python: python3
@@ -283,6 +291,7 @@
         - tox-pep8
         - nodepool-tox-py36
         - nodepool-tox-py38
+        - nodepool-tox-py39
         - nodepool-zuul-functional:
             voting: false
         - nodepool-functional-container-openstack-release
@@ -300,6 +309,7 @@
         - tox-pep8
         - nodepool-tox-py36
         - nodepool-tox-py38
+        - nodepool-tox-py39
         - nodepool-functional-k8s
         - nodepool-functional-openshift
         - zuul-quick-start:
diff --git a/setup.cfg b/setup.cfg
index 095f3d250..98f9f9282 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,7 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [pbr]
 warnerrors = True