diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 614cdf868c..c98e8fe4ee 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -2745,6 +2745,10 @@ function ironic_configure_tempest {
         iniset $TEMPEST_CONFIG baremetal unrescue_timeout $IRONIC_TEMPEST_BUILD_TIMEOUT
     fi
 
+    if [[ $IRONIC_VM_VOLUME_COUNT -gt 1 ]]; then
+        iniset $TEMPEST_CONFIG baremetal_feature_enabled software_raid True
+    fi
+
     # Enabled features
     iniset $TEMPEST_CONFIG baremetal_feature_enabled ipxe_enabled $IRONIC_IPXE_ENABLED
     iniset $TEMPEST_CONFIG baremetal_feature_enabled fast_track_discovery $IRONIC_DEPLOY_FAST_TRACK
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 7d27a7992b..4b106c5829 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -107,6 +107,7 @@
         IRONIC_ENABLED_DEPLOY_INTERFACES: "iscsi,direct,ansible"
         IRONIC_RPC_TRANSPORT: json-rpc
         IRONIC_VM_COUNT: 6
+        IRONIC_VM_VOLUME_COUNT: 2
         SWIFT_ENABLE_TEMPURLS: True
         SWIFT_TEMPURL_KEY: secretkey
       devstack_services: