diff --git a/test/nvmf/host/bdevperf.sh b/test/nvmf/host/bdevperf.sh
index 2883144e6..1a544a002 100755
--- a/test/nvmf/host/bdevperf.sh
+++ b/test/nvmf/host/bdevperf.sh
@@ -21,13 +21,6 @@ function tgt_init() {
 }
 
 nvmftestinit
-# There is an intermittent error relating to this test and Soft-RoCE. for now, just
-# skip this test if we are using rxe. TODO: get to the bottom of GitHub issue #1165
-if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
-	echo "Using software RDMA, skipping the host bdevperf tests."
-	exit 0
-fi
-
 tgt_init
 
 "$rootdir/test/bdev/bdevperf/bdevperf" --json <(gen_nvmf_target_json) -q 128 -o 4096 -w verify -t 1
diff --git a/test/nvmf/host/target_disconnect.sh b/test/nvmf/host/target_disconnect.sh
index 5fe3b2c6a..22c077afb 100755
--- a/test/nvmf/host/target_disconnect.sh
+++ b/test/nvmf/host/target_disconnect.sh
@@ -73,16 +73,10 @@ function nvmf_target_disconnect_tc3() {
 }
 
 nvmftestinit
-# There is an intermittent error relating to this test and Soft-RoCE. for now, just
-# skip this test if we are using rxe. TODO: get to the bottom of GitHub issue #1043
-if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
-	echo "Using software RDMA, skipping the target disconnect tests."
-else
-	run_test "nvmf_target_disconnect_tc1" nvmf_target_disconnect_tc1
-	run_test "nvmf_target_disconnect_tc2" nvmf_target_disconnect_tc2
-	if [ -n "$NVMF_SECOND_TARGET_IP" ]; then
-		run_test "nvmf_target_disconnect_tc3" nvmf_target_disconnect_tc3
-	fi
+run_test "nvmf_target_disconnect_tc1" nvmf_target_disconnect_tc1
+run_test "nvmf_target_disconnect_tc2" nvmf_target_disconnect_tc2
+if [ -n "$NVMF_SECOND_TARGET_IP" ]; then
+	run_test "nvmf_target_disconnect_tc3" nvmf_target_disconnect_tc3
 fi
 
 trap - SIGINT SIGTERM EXIT
diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh
index b33d55cff..bca96650a 100755
--- a/test/nvmf/nvmf.sh
+++ b/test/nvmf/nvmf.sh
@@ -21,8 +21,6 @@ if [ $SPDK_TEST_NVME_CLI -eq 1 ]; then
 	run_test "nvmf_nvme_cli" test/nvmf/target/nvme_cli.sh "${TEST_ARGS[@]}"
 fi
 run_test "nvmf_lvol" test/nvmf/target/nvmf_lvol.sh "${TEST_ARGS[@]}"
-#TODO: disabled due to intermittent failures. Need to triage.
-# run_test "nvmf_srq_overwhelm" test/nvmf/target/srq_overwhelm.sh $TEST_ARGS
 run_test "nvmf_vhost" test/nvmf/target/nvmf_vhost.sh "${TEST_ARGS[@]}"
 run_test "nvmf_bdev_io_wait" test/nvmf/target/bdev_io_wait.sh "${TEST_ARGS[@]}"
 run_test "nvmf_create_transport." test/nvmf/target/create_transport.sh "${TEST_ARGS[@]}"
@@ -37,14 +35,20 @@ fi
 run_test "nvmf_nmic" test/nvmf/target/nmic.sh "${TEST_ARGS[@]}"
 run_test "nvmf_rpc" test/nvmf/target/rpc.sh "${TEST_ARGS[@]}"
 run_test "nvmf_fio" test/nvmf/target/fio.sh "${TEST_ARGS[@]}"
-run_test "nvmf_shutdown" test/nvmf/target/shutdown.sh "${TEST_ARGS[@]}"
 run_test "nvmf_bdevio" test/nvmf/target/bdevio.sh "${TEST_ARGS[@]}"
 run_test "nvmf_invalid" test/nvmf/target/invalid.sh "${TEST_ARGS[@]}"
 run_test "nvmf_abort" test/nvmf/target/abort.sh "${TEST_ARGS[@]}"
 
+if ! check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
+	# Soft-RoCE will return invalid values in the WC field after a qp has been
+	# destroyed which lead to NULL pointer references not seen in real hardware.
+	run_test "nvmf_shutdown" test/nvmf/target/shutdown.sh "${TEST_ARGS[@]}"
+	#TODO: disabled due to intermittent failures. Need to triage.
+	# run_test "nvmf_srq_overwhelm" test/nvmf/target/srq_overwhelm.sh $TEST_ARGS
+fi
+
 timing_enter host
 
-run_test "nvmf_bdevperf" test/nvmf/host/bdevperf.sh "${TEST_ARGS[@]}"
 run_test "nvmf_identify" test/nvmf/host/identify.sh "${TEST_ARGS[@]}"
 run_test "nvmf_perf" test/nvmf/host/perf.sh "${TEST_ARGS[@]}"
 
@@ -52,7 +56,15 @@ run_test "nvmf_perf" test/nvmf/host/perf.sh "${TEST_ARGS[@]}"
 #run_test test/nvmf/host/identify_kernel_nvmf.sh $TEST_ARGS
 run_test "nvmf_aer" test/nvmf/host/aer.sh "${TEST_ARGS[@]}"
 run_test "nvmf_fio" test/nvmf/host/fio.sh "${TEST_ARGS[@]}"
-run_test "nvmf_target_disconnect" test/nvmf/host/target_disconnect.sh "${TEST_ARGS[@]}"
+
+# There is an intermittent error relating to those tests and Soft-RoCE.
+# Skip those tests if we are using rxe.
+if ! check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
+	# GitHub issue #1165
+	run_test "nvmf_bdevperf" test/nvmf/host/bdevperf.sh "${TEST_ARGS[@]}"
+	# GitHub issue #1043
+	run_test "nvmf_target_disconnect" test/nvmf/host/target_disconnect.sh "${TEST_ARGS[@]}"
+fi
 
 timing_exit host
 
diff --git a/test/nvmf/target/shutdown.sh b/test/nvmf/target/shutdown.sh
index 662c53b80..8ad73bd6f 100755
--- a/test/nvmf/target/shutdown.sh
+++ b/test/nvmf/target/shutdown.sh
@@ -146,14 +146,6 @@ function nvmf_shutdown_tc3() {
 	stoptarget
 }
 
-# The shutdown tests create a lot of edge cases that Soft-RoCE doesn't respond well to.
-# Specifically Soft-RoCE will return invalid values in the WC field after a qp has been
-# destroyed which lead to NULL pointer references not seen in real hardware.
-if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
-	echo "Using software RDMA, skipping the shutdown tests."
-	exit 0
-fi
-
 nvmftestinit
 
 run_test "nvmf_shutdown_tc1" nvmf_shutdown_tc1
diff --git a/test/nvmf/target/srq_overwhelm.sh b/test/nvmf/target/srq_overwhelm.sh
index fe4dd7d29..98af97aab 100755
--- a/test/nvmf/target/srq_overwhelm.sh
+++ b/test/nvmf/target/srq_overwhelm.sh
@@ -12,11 +12,6 @@ rpc_py="$rootdir/scripts/rpc.py"
 
 nvmftestinit
 
-if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
-	echo "Using software RDMA, Likely not enough memory to run this test. aborting."
-	exit 0
-fi
-
 nvmfappstart -m 0xF
 
 # create the rdma transport with an intentionally small SRQ depth