diff --git a/.zuul.yaml b/.zuul.yaml
index bc9d19e94c..80d690c3e9 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -48,23 +48,23 @@
       - name: openstack/taskflow
 
 - job:
-    name: glance-tox-functional-py38-rbac-defaults
-    parent: openstack-tox-functional-py38
+    name: glance-tox-functional-py39-rbac-defaults
+    parent: openstack-tox-functional-py39
     voting: false
     description: |
-      Glance py38 functional tests with enforce_secure_rbac=True
+      Glance py39 functional tests with enforce_secure_rbac=True
     vars:
-      python_version: 3.8
-      tox_envlist: functional-py38-rbac
+      python_version: 3.9
+      tox_envlist: functional-py39-rbac
 
 - job:
-    name: glance-tox-functional-py38-oslo-tips
+    name: glance-tox-functional-py39-oslo-tips
     parent: glance-tox-oslo-tips-base
     description: |
-      Glance py38 functional tests vs. oslo libraries masters
+      Glance py39 functional tests vs. oslo libraries masters
     vars:
-      python_version: 3.8
-      tox_envlist: functional-py38
+      python_version: 3.9
+      tox_envlist: functional-py39
 
 - job:
     name: glance-tox-functional-py36-oslo-tips
@@ -89,13 +89,13 @@
       - name: openstack/python-keystoneclient
 
 - job:
-    name: glance-tox-py38-keystone-tips
+    name: glance-tox-py39-keystone-tips
     parent: glance-tox-keystone-tips-base
     description: |
-      Glance py38 unit tests vs. keystone masters
+      Glance py39 unit tests vs. keystone masters
     vars:
-      python_version: 3.8
-      tox_envlist: py38
+      python_version: 3.9
+      tox_envlist: py39
 
 - job:
     name: glance-tox-py36-keystone-tips
@@ -108,13 +108,13 @@
       tox_envlist: py36
 
 - job:
-    name: glance-tox-functional-py38-keystone-tips
+    name: glance-tox-functional-py39-keystone-tips
     parent: glance-tox-keystone-tips-base
     description: |
-      Glance py38 functional tests vs. keystone masters
+      Glance py39 functional tests vs. keystone masters
     vars:
-      python_version: 3.8
-      tox_envlist: functional-py38
+      python_version: 3.9
+      tox_envlist: functional-py39
 
 - job:
     name: glance-tox-functional-py36-keystone-tips
@@ -137,13 +137,13 @@
       - name: openstack/glance_store
 
 - job:
-    name: glance-tox-py38-glance_store-tips
+    name: glance-tox-py39-glance_store-tips
     parent: glance-tox-glance_store-tips-base
     description: |
-      Glance py38 unit tests vs. glance_store master
+      Glance py39 unit tests vs. glance_store master
     vars:
-      python_version: 3.8
-      tox_envlist: py38
+      python_version: 3.9
+      tox_envlist: py39
 
 - job:
     name: glance-tox-py36-glance_store-tips
@@ -156,13 +156,13 @@
       tox_envlist: py36
 
 - job:
-    name: glance-tox-functional-py38-glance_store-tips
+    name: glance-tox-functional-py39-glance_store-tips
     parent: glance-tox-glance_store-tips-base
     description: |
-      Glance py38 functional tests vs. glance_store master
+      Glance py39 functional tests vs. glance_store master
     vars:
-      python_version: 3.8
-      tox_envlist: functional-py38
+      python_version: 3.9
+      tox_envlist: functional-py39
 
 - job:
     name: glance-tox-functional-py36-glance_store-tips
@@ -187,13 +187,13 @@
       - name: openstack/castellan
 
 - job:
-    name: glance-tox-py38-cursive-tips
+    name: glance-tox-py39-cursive-tips
     parent: glance-tox-cursive-tips-base
     description: |
-      Glance py38 unit tests vs. cursive (and related libs) master
+      Glance py39 unit tests vs. cursive (and related libs) master
     vars:
-      python_version: 3.8
-      tox_envlist: py38
+      python_version: 3.9
+      tox_envlist: py39
 
 - job:
     name: glance-tox-py36-cursive-tips
@@ -206,13 +206,13 @@
       tox_envlist: py36
 
 - job:
-    name: glance-tox-functional-py38-cursive-tips
+    name: glance-tox-functional-py39-cursive-tips
     parent: glance-tox-cursive-tips-base
     description: |
-      Glance py38 functional tests vs. cursive (and related libs) master
+      Glance py39 functional tests vs. cursive (and related libs) master
     vars:
-      python_version: 3.8
-      tox_envlist: functional-py38
+      python_version: 3.9
+      tox_envlist: functional-py39
 
 - job:
     name: glance-tox-functional-py36-cursive-tips
@@ -304,8 +304,8 @@
     check:
       jobs:
         - openstack-tox-functional-py36
-        - openstack-tox-functional-py38
-        - glance-tox-functional-py38-rbac-defaults
+        - openstack-tox-functional-py39
+        - glance-tox-functional-py39-rbac-defaults
         - glance-code-constants-check
         - glance-ceph-thin-provisioning:
             voting: false
@@ -340,7 +340,7 @@
     gate:
       jobs:
         - openstack-tox-functional-py36
-        - openstack-tox-functional-py38
+        - openstack-tox-functional-py39
         - tempest-integrated-storage:
             irrelevant-files: *tempest-irrelevant-files
         - tempest-integrated-storage-import:
@@ -356,9 +356,9 @@
         - glance-secure-rbac-protection-functional
     experimental:
       jobs:
-        - glance-tox-py38-glance_store-tips
+        - glance-tox-py39-glance_store-tips
         - glance-tox-py36-glance_store-tips
-        - glance-tox-functional-py38-glance_store-tips
+        - glance-tox-functional-py39-glance_store-tips
         - glance-tox-functional-py36-glance_store-tips
         - barbican-tempest-plugin-simple-crypto
         - grenade-multinode
@@ -378,31 +378,31 @@
         # to define these jobs in the openstack/project-config repo.
         # That would make us less agile in adjusting these tests, so we
         # aren't doing that either.
-        - glance-tox-functional-py38-oslo-tips:
+        - glance-tox-functional-py39-oslo-tips:
             branches: master
         - glance-tox-functional-py36-oslo-tips:
             branches: master
-        - glance-tox-py38-keystone-tips:
+        - glance-tox-py39-keystone-tips:
             branches: master
         - glance-tox-py36-keystone-tips:
             branches: master
-        - glance-tox-functional-py38-keystone-tips:
+        - glance-tox-functional-py39-keystone-tips:
             branches: master
         - glance-tox-functional-py36-keystone-tips:
             branches: master
-        - glance-tox-py38-glance_store-tips:
+        - glance-tox-py39-glance_store-tips:
             branches: master
         - glance-tox-py36-glance_store-tips:
             branches: master
-        - glance-tox-functional-py38-glance_store-tips:
+        - glance-tox-functional-py39-glance_store-tips:
             branches: master
         - glance-tox-functional-py36-glance_store-tips:
             branches: master
-        - glance-tox-py38-cursive-tips:
+        - glance-tox-py39-cursive-tips:
             branches: master
         - glance-tox-py36-cursive-tips:
             branches: master
-        - glance-tox-functional-py38-cursive-tips:
+        - glance-tox-functional-py39-cursive-tips:
             branches: master
         - glance-tox-functional-py36-cursive-tips:
             branches: master
diff --git a/setup.cfg b/setup.cfg
index 7351e0b943..0925b8c44c 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]
 data_files =
diff --git a/tox.ini b/tox.ini
index c66202434d..db9f7a15d8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 3.18.0
 # python runtimes: https://governance.openstack.org/tc/reference/runtimes/ussuri.html
-envlist = functional-py38,py38,py36,pep8
+envlist = functional-py39,py39,py36,pep8
 skipsdist = True
 skip_missing_interpreters = true
 # this allows tox to infer the base python from the environment name
@@ -64,6 +64,12 @@ setenv =
   OS_GLANCE_TEST_RBAC_DEFAULTS = True
 commands = {[testenv:functional]commands}
 
+[testenv:functional-py39-rbac]
+setenv =
+  {[testenv:functional]setenv}
+  OS_GLANCE_TEST_RBAC_DEFAULTS = True
+commands = {[testenv:functional]commands}
+
 [testenv:genpolicy]
 basepython = python3
 commands =
@@ -192,3 +198,7 @@ commands =
 [testenv:debug-py38]
 commands =
   oslo_debug_helper {posargs}
+
+[testenv:debug-py39]
+commands =
+  oslo_debug_helper {posargs}