diff --git a/.zuul.yaml b/.zuul.yaml
index 6c8baaa..82d4af5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,19 +1,6 @@
 - project:
     templates:
       - check-requirements
+      - openstack-python3-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
-    check:
-      jobs:
-        - openstack-tox-pep8
-        - openstack-tox-py36
-        - openstack-tox-py37
-        - openstack-tox-py38
-        - openstack-tox-py39
-    gate:
-      jobs:
-        - openstack-tox-pep8
-        - openstack-tox-py36
-        - openstack-tox-py37
-        - openstack-tox-py38
-        - openstack-tox-py39
diff --git a/setup.cfg b/setup.cfg
index cbc7bed..17c4303 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ description_file =
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page =  https://docs.openstack.org/os-testr/latest/
-python_requires = >=3.6
+python_requires = >=3.8
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -15,8 +15,6 @@ classifier =
     Operating System :: POSIX :: Linux
     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
     Programming Language :: Python :: 3 :: Only