diff --git a/test/bdev/bdev.conf.in b/test/bdev/bdev.conf.in
index c59b64fd26..ac31381cbf 100644
--- a/test/bdev/bdev.conf.in
+++ b/test/bdev/bdev.conf.in
@@ -3,7 +3,7 @@
   PT Malloc3 TestPT
 
 [Malloc]
-  NumberOfLuns 4
+  NumberOfLuns 6
   LunSizeInMB 64
 
 [Split]
diff --git a/test/bdev/blockdev.sh b/test/bdev/blockdev.sh
index 9653ab9eee..326f581125 100755
--- a/test/bdev/blockdev.sh
+++ b/test/bdev/blockdev.sh
@@ -84,6 +84,11 @@ timing_enter bounds
 $testdir/bdevio/bdevio $testdir/bdev.conf
 timing_exit bounds
 
+# RAID module doesn't support multi-iov yet, so bdevio test
+# would fail.  So wait to append the RAID configuration until
+# after bdevio has run.
+cat $testdir/raid.conf >> $testdir/bdev.conf
+
 timing_enter nbd_gpt
 if grep -q Nvme0 $testdir/bdev.conf; then
 	part_dev_by_gpt $testdir/bdev.conf Nvme0n1 $rootdir
diff --git a/test/bdev/raid.conf b/test/bdev/raid.conf
new file mode 100644
index 0000000000..7b9e0e8b9b
--- /dev/null
+++ b/test/bdev/raid.conf
@@ -0,0 +1,6 @@
+[RAID0]
+  Name raid0
+  StripSize 64
+  NumDevices 2
+  RaidLevel 0
+  Devices Malloc4 Malloc5
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index ed4b9eb11a..7113cc7a0e 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -79,6 +79,11 @@ if echo -e "#include <libunwind.h>\nint main(int argc, char *argv[]) {return 0;}
 	config_params+=' --enable-log-bt=ERROR'
 fi
 
+# RAID is marked experimental and not built by default currently, since it does not
+#  support iov (meaning vhost will not work).  But enable it in the build here, to make
+#  sure it gets built and run against a limited set of use cases for now.
+config_params+=' --with-raid'
+
 export UBSAN_OPTIONS='halt_on_error=1:print_stacktrace=1:abort_on_error=1'
 
 # On Linux systems, override the default HUGEMEM in scripts/setup.sh to