diff --git a/.zuul.yaml b/.zuul.yaml
index 7656be7f50..dc3c97310e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -18,16 +18,6 @@
         nodes:
           - controller
 
-- nodeset:
-    name: openstack-single-node-bionic
-    nodes:
-      - name: controller
-        label: ubuntu-bionic
-    groups:
-      - name: tempest
-        nodes:
-          - controller
-
 - nodeset:
     name: devstack-single-node-centos-9-stream
     nodes:
@@ -148,36 +138,6 @@
         nodes:
           - compute1
 
-- nodeset:
-    name: openstack-two-node-bionic
-    nodes:
-      - name: controller
-        label: ubuntu-bionic
-      - name: compute1
-        label: ubuntu-bionic
-    groups:
-      # Node where tests are executed and test results collected
-      - name: tempest
-        nodes:
-          - controller
-      # Nodes running the compute service
-      - name: compute
-        nodes:
-          - controller
-          - compute1
-      # Nodes that are not the controller
-      - name: subnode
-        nodes:
-          - compute1
-      # Switch node for multinode networking setup
-      - name: switch
-        nodes:
-          - controller
-      # Peer nodes for multinode networking setup
-      - name: peers
-        nodes:
-          - compute1
-
 - nodeset:
     name: openstack-three-node-focal
     nodes:
@@ -213,41 +173,6 @@
           - compute1
           - compute2
 
-- nodeset:
-    name: openstack-three-node-bionic
-    nodes:
-      - name: controller
-        label: ubuntu-bionic
-      - name: compute1
-        label: ubuntu-bionic
-      - name: compute2
-        label: ubuntu-bionic
-    groups:
-      # Node where tests are executed and test results collected
-      - name: tempest
-        nodes:
-          - controller
-      # Nodes running the compute service
-      - name: compute
-        nodes:
-          - controller
-          - compute1
-          - compute2
-      # Nodes that are not the controller
-      - name: subnode
-        nodes:
-          - compute1
-          - compute2
-      # Switch node for multinode networking setup
-      - name: switch
-        nodes:
-          - controller
-      # Peer nodes for multinode networking setup
-      - name: peers
-        nodes:
-          - compute1
-          - compute2
-
 - job:
     name: devstack-base
     parent: multinode
@@ -765,7 +690,8 @@
         - devstack-unit-tests
         - openstack-tox-bashate
         - ironic-tempest-bios-ipmi-direct-tinyipa
-        - swift-dsvm-functional
+        - swift-dsvm-functional:
+            voting: false
         - grenade:
             irrelevant-files:
               - ^.*\.rst$
@@ -821,7 +747,8 @@
               - ^.*\.rst$
               - ^doc/.*$
         - ironic-tempest-bios-ipmi-direct-tinyipa
-        - swift-dsvm-functional
+        - swift-dsvm-functional:
+            voting: false
         - grenade:
             irrelevant-files:
               - ^.*\.rst$
diff --git a/tox.ini b/tox.ini
index d323fe457a..4ffac27687 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,6 +37,7 @@ commands = bash -c "find {toxinidir}             \
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
   -r{toxinidir}/doc/requirements.txt
+  setuptools<81
 allowlist_externals = bash
 setenv =
   TOP_DIR={toxinidir}