diff --git a/.zuul.yaml b/.zuul.yaml
index 65a8a621..149e6c57 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,7 +3,7 @@
       - publish-openstack-docs-pti
       - openstack-cover-jobs
       - openstack-python35-jobs
-      - openstack-python3-victoria-jobs
+      - openstack-python3-wallaby-jobs
       - release-notes-jobs-python3
     check:
       jobs:
diff --git a/setup.cfg b/setup.cfg
index 8502215b..3abda395 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,6 +26,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 054a95c3..1dfd5499 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 3.18.0
 skipsdist = True
-envlist = py36,py38,pep8,pypy
+envlist = py,pep8
 ignore_basepython_conflict = True
 
 [testenv]