diff --git a/.zuul.yaml b/.zuul.yaml
index 5b347a7..5698607 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -43,12 +43,13 @@
 - project:
     templates:
       - check-requirements
-      - openstack-python3-victoria-jobs
       - validations-common-molecule-jobs
     check:
       jobs:
         - openstack-tox-linters
         - openstack-tox-cover
+        - openstack-tox-py36
+        - openstack-tox-py39
         - validations-common-functional
         - tripleo-ci-centos-8-content-provider:
             dependencies:
@@ -70,6 +71,8 @@
     gate:
       jobs:
         - openstack-tox-linters
+        - openstack-tox-py36
+        - openstack-tox-py39
         - validations-common-functional
         - tripleo-ci-centos-8-content-provider:
             dependencies:
diff --git a/setup.cfg b/setup.cfg
index 8f71866..3c310d8 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 =
diff --git a/tox.ini b/tox.ini
index 4677808..37375b6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.2.0
-envlist = linters,docs,py38,molecule
+envlist = linters,docs,py,molecule
 skipdist = True
 requires =
     tox-ansible >= 1.0.5