diff --git a/.zuul.yaml b/.zuul.yaml
index 4c61f5f4c42..47bd3cd8f91 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -24,7 +24,7 @@
               - ^contrib/block-box.*$
               - ^doc/.*$
               - ^releasenotes/.*$
-        - openstack-tox-functional-py38:
+        - openstack-tox-functional-py39:
             irrelevant-files: *functional-irrelevant-files
         - cinder-rally-task:
             voting: false
diff --git a/setup.cfg b/setup.cfg
index 212c24d482c..9b057ad5a40 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
 project_urls:
     Source=https://opendev.org/openstack/cinder
     Tracker=https://bugs.launchpad.net/cinder
diff --git a/tox.ini b/tox.ini
index 4491cf7344c..e68f6a6cf2c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -58,6 +58,10 @@ setenv =
 setenv =
   {[testenv:functional]setenv}
 
+[testenv:functional-py39]
+setenv =
+  {[testenv:functional]setenv}
+
 [testenv:api-samples]
 envdir = {toxworkdir}/shared
 setenv =