diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index 4f0c19d28..165b4427a 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -3,9 +3,6 @@
       - openstack-python3-jobs
     check:
       jobs:
-        - build-wheel-cache-ubuntu-bionic:
-            files:
-              - bindep.txt
         - build-wheel-cache-ubuntu-focal:
             files:
               - bindep.txt
@@ -65,9 +62,6 @@
               - bindep.txt
     gate:
       jobs:
-        - build-wheel-cache-ubuntu-bionic:
-            files:
-              - bindep.txt
         - build-wheel-cache-ubuntu-focal:
             files:
               - bindep.txt
diff --git a/tox.ini b/tox.ini
index c75268cda..3d97a0da9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,12 @@ deps = -c{toxinidir}/upper-constraints.txt
 commands =
   stestr run {posargs}
 
+[testenv:py311]
+deps = -c{toxinidir}/upper-constraints.txt
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+       setuptools<82.0.0
+
 [testenv:py38-check-uc]
 allowlist_externals =
   check-conflicts
@@ -56,6 +62,10 @@ commands = generate-constraints {posargs: -b blacklist.txt -r global-requirement
 [testenv:validate]
 allowlist_externals =
   validate-constraints
+deps = -c{toxinidir}/upper-constraints.txt
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+       setuptools<82.0.0
 commands =
     validate-constraints {toxinidir}/global-requirements.txt {toxinidir}/upper-constraints.txt {toxinidir}/blacklist.txt