diff --git a/.zuul.yaml b/.zuul.yaml
index 69d2c0b..5142bb6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -68,11 +68,8 @@
         - tox-linters:
             vars:
               tox_install_bindep: false
-        - tox-py36:
-            nodeset: ubuntu-bionic
-            timeout: 3600
         - tox-py38:
-            nodeset: ubuntu-bionic
+            nodeset: ubuntu-focal
             timeout: 3600
         - tox-py310:
             nodeset: ubuntu-jammy
@@ -85,11 +82,8 @@
         - tox-linters:
             vars:
               tox_install_bindep: false
-        - tox-py36:
-            nodeset: ubuntu-bionic
-            timeout: 3600
         - tox-py38:
-            nodeset: ubuntu-bionic
+            nodeset: ubuntu-focal
             timeout: 3600
         - tox-py310:
             nodeset: ubuntu-jammy
diff --git a/setup.cfg b/setup.cfg
index ab9e668..7dbd49d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,8 +26,6 @@ classifier =
     Operating System :: OS Independent
     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.10
@@ -39,7 +37,7 @@ classifier =
     Topic :: Utilities
 
 [options]
-python-requires = >=3.6
+python-requires = >=3.8
 
 [files]
 packages = zuulclient