diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index e3b17432d4..13b389d19e 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -7,7 +7,8 @@
     required-projects:
       - openstack/ironic
       - openstack/ironic-python-agent
-      - openstack/ironic-tempest-plugin
+      - name: openstack/ironic-tempest-plugin
+        override-checkout: 1.5.1
     irrelevant-files:
       - ^.*\.rst$
       - ^api-ref/.*$
@@ -307,7 +308,8 @@
     required-projects:
       - openstack/ironic
       - openstack/ironic-python-agent
-      - openstack/ironic-tempest-plugin
+      - name: openstack/ironic-tempest-plugin
+        override-checkout: 1.5.1
       - openstack/networking-generic-switch
     irrelevant-files:
       - ^.*\.rst$
diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml
index 0b511cfa13..ab4d50d042 100644
--- a/zuul.d/legacy-ironic-jobs.yaml
+++ b/zuul.d/legacy-ironic-jobs.yaml
@@ -19,7 +19,8 @@
       - openstack/ironic
       - openstack/ironic-lib
       - openstack/ironic-python-agent
-      - openstack/ironic-tempest-plugin
+      - name: openstack/ironic-tempest-plugin
+        override-checkout: 1.5.1
       - openstack/python-ironicclient
     pre-run: playbooks/legacy/ironic-dsvm-base/pre.yaml
     post-run: playbooks/legacy/ironic-dsvm-base/post.yaml
@@ -48,7 +49,8 @@
       - openstack/ironic
       - openstack/ironic-lib
       - openstack/ironic-python-agent
-      - openstack/ironic-tempest-plugin
+      - name: openstack/ironic-tempest-plugin
+        override-checkout: 1.5.1
       - openstack/networking-generic-switch
       - openstack/python-ironicclient
     pre-run: playbooks/legacy/ironic-dsvm-base-multinode/pre.yaml
@@ -83,4 +85,3 @@
       - openstack/ironic-python-agent
       - openstack/networking-generic-switch
       - openstack/python-ironicclient
-
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index dc693dac39..70c0786a7f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -16,11 +16,14 @@
         - ironic-tempest-functional-python2
         - ironic-tempest-functional-python3
         - ironic-grenade-dsvm
-        - ironic-grenade-dsvm-multinode-multitenant
+        # Disable to get the fix for other jobs
+        - ironic-grenade-dsvm-multinode-multitenant:
+            voting: false
         - ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3
         - ironic-tempest-ipa-partition-redfish-tinyipa
         - ironic-tempest-ipa-partition-uefi-pxe_ipmitool-tinyipa
-        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
+        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode:
+            voting: false
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa-indirect
         - ironic-tempest-ipa-partition-bios-agent_ipmitool-tinyipa-indirect
@@ -45,11 +48,11 @@
         - ironic-tempest-functional-python2
         - ironic-tempest-functional-python3
         - ironic-grenade-dsvm
-        - ironic-grenade-dsvm-multinode-multitenant
+        # - ironic-grenade-dsvm-multinode-multitenant
         - ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3
         - ironic-tempest-ipa-partition-redfish-tinyipa
         - ironic-tempest-ipa-partition-uefi-pxe_ipmitool-tinyipa
-        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
+        # - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa-indirect
         - ironic-tempest-ipa-partition-bios-agent_ipmitool-tinyipa-indirect