diff --git a/test/nvmf/shutdown/shutdown.sh b/test/nvmf/shutdown/shutdown.sh
index a7169b945..923364182 100755
--- a/test/nvmf/shutdown/shutdown.sh
+++ b/test/nvmf/shutdown/shutdown.sh
@@ -39,9 +39,9 @@ timing_exit start_nvmf_tgt
 num_subsystems=10
 # SoftRoce does not have enough queues available for
 # this test. Detect if we're using software RDMA.
-# If so, only use one subsystem.
+# If so, only use four subsystems.
 if check_ip_is_soft_roce "$NVMF_FIRST_TARGET_IP"; then
-	num_subsystems=1
+	num_subsystems=4
 fi
 
 # Create subsystems
@@ -58,7 +58,19 @@ done
 modprobe -v nvme-rdma
 modprobe -v nvme-fabrics
 
-# Connect kernel host to subsystems
+# Repeatedly connect and disconnect
+for ((x=0; x<5;x++)); do
+	# Connect kernel host to subsystems
+	for i in `seq 1 $num_subsystems`; do
+		nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode${i}" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"
+	done
+	# Disconnect the subsystems in reverse order
+	for i in `seq $num_subsystems -1 1`; do
+		nvme disconnect -n nqn.2016-06.io.spdk:cnode${i}
+	done
+done
+
+# Start a series of connects right before disconnecting
 for i in `seq 1 $num_subsystems`; do
 	nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode${i}" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"
 done