diff --git a/.zuul.yaml b/.zuul.yaml
index 13b0178..aae3e1c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,6 +2,20 @@
     templates:
       - check-requirements
       - publish-openstack-docs-pti
-      - openstack-python35-jobs
-      - openstack-python3-yoga-jobs
       - openstack-cover-jobs
+    check:
+      jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py35
+        - openstack-tox-py36
+        - openstack-tox-py37
+        - openstack-tox-py38
+        - openstack-tox-py39
+    gate:
+      jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py35
+        - openstack-tox-py36
+        - openstack-tox-py37
+        - openstack-tox-py38
+        - openstack-tox-py39
diff --git a/setup.cfg b/setup.cfg
index 1828bc2..6546a2f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,7 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: Implementation :: CPython