diff --git a/setup.cfg b/setup.cfg
index ecbff13..3b611c1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,6 +20,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/zuul.d/project.yaml b/zuul.d/project.yaml
index 415dcac..12ab48e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -2,12 +2,16 @@
 - project:
     templates:
       - openstack-cover-jobs
-      - openstack-python3-victoria-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
 
     check:
       jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py36
+        - openstack-tox-py37
+        - openstack-tox-py38
+        - openstack-tox-py39
         - tenks-tox-ansible-lint
         - tenks-deploy-teardown-ovs-centos8
         - tenks-deploy-teardown-ovs-ubuntu
@@ -19,6 +23,11 @@
     gate:
       queue: tenks
       jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py36
+        - openstack-tox-py37
+        - openstack-tox-py38
+        - openstack-tox-py39
         - tenks-tox-ansible-lint
         - tenks-deploy-teardown-ovs-centos8
         - tenks-deploy-teardown-ovs-ubuntu