diff --git a/.zuul.yaml b/.zuul.yaml
index 5372bc4da3..cb0ed66e88 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -18,8 +18,8 @@
       zuul_work_dir: src/opendev.org/openstack/python-openstackclient
 
 - job:
-    name: osc-tox-py36-tips
-    parent: openstack-tox-py36
+    name: osc-tox-py38-tips
+    parent: openstack-tox-py38
     description: |
       Run unit tests for OpenStackClient with master branch of important libs.
 
@@ -229,10 +229,10 @@
     name: osc-tox-unit-tips
     check:
       jobs:
-        - osc-tox-py36-tips
+        - osc-tox-py38-tips
     gate:
       jobs:
-        - osc-tox-py36-tips
+        - osc-tox-py38-tips
 
 - project:
     templates:
diff --git a/setup.cfg b/setup.cfg
index 79e805f04e..7cb073a7bc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,7 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [files]
 packages =