diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 104096c997..9060691822 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -2968,6 +2968,9 @@ function ironic_configure_tempest {
     if [[ -n "$IRONIC_IP_VERSION" ]]; then
         iniset $TEMPEST_CONFIG validation ip_version_for_ssh $IRONIC_IP_VERSION
     fi
+    if [[ -n "$IRONIC_BOOT_MODE" ]]; then
+        iniset $TEMPEST_CONFIG baremetal boot_mode $IRONIC_BOOT_MODE
+    fi
     if [[ "$IRONIC_IP_VERSION" == "6" ]]; then
         # No FIPs in V6 and we dynamically create networks...
         # network_for_ssh is defaulted to public
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 8806ca95bf..a221f7ecc5 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -254,12 +254,15 @@
 
 - job:
     name: ironic-tempest-ipa-partition-pxe_ipmitool
-    description: ironic-tempest-ipa-partition-pxe_ipmitool
+    description: ironic-tempest-ipa-partition-pxe_ipmitool that also tests cleaning.
     parent: ironic-base
     timeout: 5400
     vars:
       devstack_localrc:
         IRONIC_DEFAULT_BOOT_OPTION: netboot
+        IRONIC_VM_COUNT: 2
+        IRONIC_AUTOMATED_CLEAN_ENABLED: True
+
 
 - job:
     name: ironic-tempest-bfv
@@ -691,7 +694,7 @@
 # Used by devstack/ironic/nova/neutron
 - job:
     name: ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
-    description: ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
+    description: ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa that also tests cleaning.
     parent: ironic-base
     timeout: 5400
     vars:
@@ -701,6 +704,7 @@
         IRONIC_ENABLED_RESCUE_INTERFACES: "fake,agent,no-rescue"
         IRONIC_RAMDISK_TYPE: tinyipa
         IRONIC_VM_SPECS_RAM: 384
+        IRONIC_VM_COUNT: 2
         IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True
         IRONIC_VM_EPHEMERAL_DISK: 0
         SWIFT_ENABLE_TEMPURLS: True