diff --git a/.zuul.yaml b/.zuul.yaml
index 9d14a37..a55c3c1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -35,10 +35,14 @@
 - project:
     templates:
       - publish-openstack-docs-pti
-      - openstack-python35-jobs
-      - openstack-python3-yoga-jobs
     check:
       jobs:
+      - openstack-tox-pep8
+      - openstack-tox-py35
+      - openstack-tox-py36
+      - openstack-tox-py37
+      - openstack-tox-py38
+      - openstack-tox-py39
       - stackviz-nodejs10-run-lint
       - stackviz-nodejs10-run-test-browser
       - tempest-full-py3:
@@ -58,6 +62,12 @@
           irrelevant-files: *irrelevant-files
     gate:
       jobs:
+      - openstack-tox-pep8
+      - openstack-tox-py35
+      - openstack-tox-py36
+      - openstack-tox-py37
+      - openstack-tox-py38
+      - openstack-tox-py39
       - stackviz-nodejs10-run-lint
       - stackviz-nodejs10-run-test-browser
 
diff --git a/setup.cfg b/setup.cfg
index e25322b..ee2fbca 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
 
 [files]
 packages =