diff --git a/.zuul.yaml b/.zuul.yaml
index 98db576b1..25d91b35f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -91,7 +91,7 @@
 
 - project:
     templates:
-      - openstack-python3-xena-jobs
+      - openstack-python3-zed-jobs
       - publish-openstack-docs-pti
       - check-requirements
       - release-notes-jobs-python3
diff --git a/releasenotes/notes/drop-python-3-6-and-3-7-e629c26cc46a52fe.yaml b/releasenotes/notes/drop-python-3-6-and-3-7-e629c26cc46a52fe.yaml
new file mode 100644
index 000000000..3d5e4e3d3
--- /dev/null
+++ b/releasenotes/notes/drop-python-3-6-and-3-7-e629c26cc46a52fe.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Python 3.6 & 3.7 support has been dropped. The minimum version of Python now
+    supported is Python 3.8.
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 3b1866e96..231219ecb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,12 +5,12 @@ description_file =
     README.rst
 license = Apache License, Version 2.0
 home_page = https://docs.openstack.org/mistral/latest/
+python_requires = >=3.8
 classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Environment :: OpenStack
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators
diff --git a/test-requirements.txt b/test-requirements.txt
index 1287f971a..948abceef 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,4 +14,4 @@ tempest>=21.0.0 # Apache-2.0
 stestr>=2.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT
 unittest2>=1.1.0 # BSD
-
+WebTest>= 3.0.0 # Apache-2.0