diff --git a/.zuul.yaml b/.zuul.yaml
index 52a7ea0a..bfdd27b4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -29,9 +29,10 @@
       - check-requirements
     check:
       jobs:
-        - openstack-tox-py36
         - openstack-tox-linters
         - openstack-tox-cover
+        - openstack-tox-py36
+        - openstack-tox-py39
         - tripleo-ci-centos-8-content-provider:
             dependencies:
               - openstack-tox-linters
@@ -53,8 +54,9 @@
         - validations-libs-functional
     gate:
       jobs:
-        - openstack-tox-py36
         - openstack-tox-linters
+        - openstack-tox-py36
+        - openstack-tox-py39
         - openstack-tox-docs: *tripleo-docs
         - validations-libs-functional
         - tripleo-ci-centos-8-content-provider:
diff --git a/setup.cfg b/setup.cfg
index 10b33051..cb9f8a03 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,7 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [files]
 packages = validations_libs
diff --git a/tox.ini b/tox.ini
index 9cc848a5..5c7898ed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.2.0
-envlist = linters,docs,py38
+envlist = linters,docs,py
 skipdist = True
 
 # Automatic envs (pyXX) will only use the python version appropriate to that