diff --git a/.zuul.yaml b/.zuul.yaml
index bd33a96ea3a7..199dc1690923 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -164,6 +164,20 @@
         q-dhcp: true
         q-l3: true
         q-meta: true
+        # NOTE(sean-k-mooney) this job is testing ml2/ovs with
+        # hybrid plug we do not need to test cinder and we want to ensure
+        # that we have at least one job without cinder in our gate so we
+        # disable it in this job
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        # we also do not need swift in this job so disable it for speed
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
       devstack_local_conf:
         post-config:
           "/$NEUTRON_CORE_PLUGIN_CONF":
@@ -190,6 +204,20 @@
           q-ovn-metadata-agent: false
           # Neutron services
           q-agt: true
+          # NOTE(sean-k-mooney) this job is testing ml2/ovs with
+          # hybrid plug we do not need to test cinder and we want to ensure
+          # that we have at least one job without cinder in our gate so we
+          # disable it in this job
+          # Cinder services
+          c-api: false
+          c-bak: false
+          c-sch: false
+          c-vol: false
+          # we also do not need swift in this job so disable it for speed
+          s-account: false
+          s-container: false
+          s-object: false
+          s-proxy: false
         devstack_local_conf:
           post-config:
             "/$NEUTRON_CORE_PLUGIN_CONF":
diff --git a/roles/run-evacuate-hook/files/test_evacuate.sh b/roles/run-evacuate-hook/files/test_evacuate.sh
index 184613cf894c..9f6c22254337 100755
--- a/roles/run-evacuate-hook/files/test_evacuate.sh
+++ b/roles/run-evacuate-hook/files/test_evacuate.sh
@@ -41,11 +41,17 @@ function evacuate_and_wait_for_active() {
     done
 }
 
-evacuate_and_wait_for_active evacuate-test
-evacuate_and_wait_for_active evacuate-bfv-test
+servers="evacuate-test"
+if openstack endpoint list | grep cinder; then
+    servers="$servers evacuate-bfv-test"
+fi
+
+for server in $servers; do
+    evacuate_and_wait_for_active $server
+done
 
 # Make sure the servers moved.
-for server in evacuate-test evacuate-bfv-test; do
+for server in $servers; do
     host=$(openstack server show ${server} -f value -c OS-EXT-SRV-ATTR:host)
     if [[ ${host} != ${CONTROLLER_HOSTNAME} ]]; then
         echo "Unexpected host ${host} for server ${server} after evacuate."
@@ -55,4 +61,6 @@ done
 
 # Cleanup test servers
 openstack server delete --wait evacuate-test
-openstack server delete --wait evacuate-bfv-test
+if [[ "$servers" =~ "bfv" ]]; then
+    openstack server delete --wait evacuate-bfv-test
+fi
diff --git a/roles/run-evacuate-hook/files/test_negative_evacuate.sh b/roles/run-evacuate-hook/files/test_negative_evacuate.sh
index 0f9041402d0b..d10baca08e2d 100755
--- a/roles/run-evacuate-hook/files/test_negative_evacuate.sh
+++ b/roles/run-evacuate-hook/files/test_negative_evacuate.sh
@@ -33,4 +33,6 @@ function evacuate_and_wait_for_error() {
 }
 
 evacuate_and_wait_for_error evacuate-test
-evacuate_and_wait_for_error evacuate-bfv-test
+if openstack endpoint list | grep cinder; then
+    evacuate_and_wait_for_error evacuate-bfv-test
+fi