diff --git a/.zuul.yaml b/.zuul.yaml
index 455dbc9..a102b1e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,19 @@
 - project:
     templates:
       - openstack-cover-jobs
-      - openstack-python3-yoga-jobs
       - release-notes-jobs-python3
       - publish-openstack-docs-pti
+    check:
+      jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py36
+        - openstack-tox-py37
+        - openstack-tox-py38
+        - openstack-tox-py39
+    gate:
+      jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py36
+        - openstack-tox-py37
+        - openstack-tox-py38
+        - openstack-tox-py39
diff --git a/setup.cfg b/setup.cfg
index 600ae03..4bffd14 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/tox.ini b/tox.ini
index a0e2c9b..90712d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.18.0
-envlist = py{38,36},pep8,pip-check-reqs
+envlist = py{39,36},pep8,pip-check-reqs
 skipsdist = True
 ignore_basepython_conflict = True