diff --git a/.zuul.yaml b/.zuul.yaml
index 5a9ff1d1..56d50298 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -21,13 +21,22 @@
       - openstack/openstack-health
 - project:
     templates:
-      - openstack-python3-yoga-jobs
       - build-openstack-docs-pti
     check:
       jobs:
-      - openstack-health-nodejs10-run-lint
-      - openstack-health-nodejs10-run-test-browser
+        - openstack-tox-pep8
+        - openstack-tox-py36
+        - openstack-tox-py37
+        - openstack-tox-py38
+        - openstack-tox-py39
+        - openstack-health-nodejs10-run-lint
+        - openstack-health-nodejs10-run-test-browser
     gate:
       jobs:
-      - openstack-health-nodejs10-run-lint
-      - openstack-health-nodejs10-run-test-browser
+        - openstack-tox-pep8
+        - openstack-tox-py36
+        - openstack-tox-py37
+        - openstack-tox-py38
+        - openstack-tox-py39
+        - openstack-health-nodejs10-run-lint
+        - openstack-health-nodejs10-run-test-browser
diff --git a/setup.cfg b/setup.cfg
index f1e27762..15e87f8e 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 d82657fc..2f3e6db8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py38,pep8,npm-test,npm-lint
+envlist = py36,py39,pep8,npm-test,npm-lint
 minversion = 3.18.0
 skipsdist = True
 ignore_basepython_conflict = True