diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 4f9961ee80..91a94db579 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -889,6 +889,9 @@ function install_ironic {
     if is_ansible_deploy_enabled; then
         pip_install "$(grep '^ansible' $IRONIC_DIR/driver-requirements.txt | awk '{print $1}')"
     fi
+
+    # Disable metadata_csum from ext4 as cirros can't mount partitions with it
+    [ -f /etc/mke2fs.conf ] && sudo sed -i -e 's/,metadata_csum//g' /etc/mke2fs.conf
 }
 
 # install_ironicclient() - Collect sources and prepare
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 128b51150e..d0995a2ac9 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -144,7 +144,6 @@
     name: ironic-tempest-dsvm-ipa-partition-redfish-tinyipa
     description: ironic-tempest-dsvm-ipa-partition-redfish-tinyipa
     parent: ironic-base
-    nodeset: openstack-single-node-xenial
     timeout: 5400
     vars:
       devstack_localrc:
@@ -207,7 +206,6 @@
     name: ironic-tempest-dsvm-ipa-partition-pxe_ipmitool-tinyipa-python3
     description: ironic-tempest-dsvm-ipa-partition-pxe_ipmitool-tinyipa-python3
     parent: ironic-base
-    nodeset: openstack-single-node-xenial
     timeout: 5400
     vars:
       devstack_localrc: