diff --git a/test/nvmf/create_transport/create_transport.sh b/test/nvmf/create_transport/create_transport.sh
index e746456d54..3514dbc10d 100755
--- a/test/nvmf/create_transport/create_transport.sh
+++ b/test/nvmf/create_transport/create_transport.sh
@@ -31,13 +31,12 @@ fi
 timing_enter cr_trprt
 timing_enter start_nvmf_tgt
 # Start up the NVMf target in another process
-$NVMF_APP -m 0xF --wait-for-rpc &
+$NVMF_APP -m 0xF &
 nvmfpid=$!
 
 trap "killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $nvmfpid
-$rpc_py start_subsystem_init
 # Use nvmf_create_transport call to create transport
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 timing_exit start_nvmf_tgt
diff --git a/test/nvmf/discovery/discovery.sh b/test/nvmf/discovery/discovery.sh
index c68ac432ec..f0db8ab36a 100755
--- a/test/nvmf/discovery/discovery.sh
+++ b/test/nvmf/discovery/discovery.sh
@@ -31,13 +31,12 @@ fi
 timing_enter discovery
 timing_enter start_nvmf_tgt
 # Start up the NVMf target in another process
-$NVMF_APP -m 0xF --wait-for-rpc &
+$NVMF_APP -m 0xF &
 nvmfpid=$!
 
 trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $nvmfpid
-$rpc_py start_subsystem_init
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 timing_exit start_nvmf_tgt
 
diff --git a/test/nvmf/filesystem/filesystem.sh b/test/nvmf/filesystem/filesystem.sh
index a00053ec20..057fc57936 100755
--- a/test/nvmf/filesystem/filesystem.sh
+++ b/test/nvmf/filesystem/filesystem.sh
@@ -27,13 +27,12 @@ timing_enter fs_test
 
 for incapsule in 0 4096; do
 	# Start up the NVMf target in another process
-	$NVMF_APP -m 0xF --wait-for-rpc &
+	$NVMF_APP -m 0xF &
 	nvmfpid=$!
 
 	trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT
 
 	waitforlisten $nvmfpid
-	$rpc_py start_subsystem_init
 	$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 -c $incapsule
 
 	bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"
diff --git a/test/nvmf/fio/fio.sh b/test/nvmf/fio/fio.sh
index 86a1291021..ba3b12b310 100755
--- a/test/nvmf/fio/fio.sh
+++ b/test/nvmf/fio/fio.sh
@@ -26,13 +26,12 @@ fi
 timing_enter fio
 timing_enter start_nvmf_tgt
 # Start up the NVMf target in another process
-$NVMF_APP -m 0xF --wait-for-rpc &
+$NVMF_APP -m 0xF &
 nvmfpid=$!
 
 trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $nvmfpid
-$rpc_py start_subsystem_init
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 
 timing_exit start_nvmf_tgt
diff --git a/test/nvmf/host/aer.sh b/test/nvmf/host/aer.sh
index 7803db3f7c..66e597aa93 100755
--- a/test/nvmf/host/aer.sh
+++ b/test/nvmf/host/aer.sh
@@ -19,13 +19,12 @@ fi
 timing_enter aer
 timing_enter start_nvmf_tgt
 
-$NVMF_APP -m 0xF --wait-for-rpc &
+$NVMF_APP -m 0xF &
 nvmfpid=$!
 
 trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $nvmfpid
-$rpc_py start_subsystem_init
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 timing_exit start_nvmf_tgt
 
diff --git a/test/nvmf/host/bdevperf.sh b/test/nvmf/host/bdevperf.sh
index f2e9b11892..1247177ffe 100755
--- a/test/nvmf/host/bdevperf.sh
+++ b/test/nvmf/host/bdevperf.sh
@@ -22,13 +22,12 @@ fi
 timing_enter bdevperf
 timing_enter start_nvmf_tgt
 
-$NVMF_APP -m 0xF --wait-for-rpc &
+$NVMF_APP -m 0xF &
 nvmfpid=$!
 
 trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $nvmfpid
-$rpc_py start_subsystem_init
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 timing_exit start_nvmf_tgt
 
diff --git a/test/nvmf/host/fio.sh b/test/nvmf/host/fio.sh
index b50fb1b76a..ceed86b8df 100755
--- a/test/nvmf/host/fio.sh
+++ b/test/nvmf/host/fio.sh
@@ -25,13 +25,12 @@ fi
 timing_enter fio
 timing_enter start_nvmf_tgt
 
-$NVMF_APP -m 0xF --wait-for-rpc &
+$NVMF_APP -m 0xF &
 nvmfpid=$!
 
 trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $nvmfpid
-$rpc_py start_subsystem_init
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 timing_exit start_nvmf_tgt
 
diff --git a/test/nvmf/host/identify.sh b/test/nvmf/host/identify.sh
index 7e9bc03b78..ad1019804e 100755
--- a/test/nvmf/host/identify.sh
+++ b/test/nvmf/host/identify.sh
@@ -21,13 +21,12 @@ fi
 timing_enter identify
 timing_enter start_nvmf_tgt
 
-$NVMF_APP -m 0xF --wait-for-rpc &
+$NVMF_APP -m 0xF &
 nvmfpid=$!
 
 trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $nvmfpid
-$rpc_py start_subsystem_init
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 timing_exit start_nvmf_tgt
 
diff --git a/test/nvmf/host/perf.sh b/test/nvmf/host/perf.sh
index fc4b4487d3..24faed5bee 100755
--- a/test/nvmf/host/perf.sh
+++ b/test/nvmf/host/perf.sh
@@ -22,13 +22,12 @@ fi
 timing_enter perf
 timing_enter start_nvmf_tgt
 
-$NVMF_APP -m 0xF --wait-for-rpc -i 0 &
+$NVMF_APP -m 0xF -i 0 &
 nvmfpid=$!
 
 trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $nvmfpid
-$rpc_py start_subsystem_init
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 $rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config
 timing_exit start_nvmf_tgt
diff --git a/test/nvmf/lvol/nvmf_lvol.sh b/test/nvmf/lvol/nvmf_lvol.sh
index e171d92d3c..7fe93a6cec 100755
--- a/test/nvmf/lvol/nvmf_lvol.sh
+++ b/test/nvmf/lvol/nvmf_lvol.sh
@@ -44,13 +44,12 @@ fi
 timing_enter lvol_integrity
 timing_enter start_nvmf_tgt
 # Start up the NVMf target in another process
-$NVMF_APP -m 0xF --wait-for-rpc &
+$NVMF_APP -m 0xF &
 pid=$!
 
 trap "process_shm --id $NVMF_APP_SHM_ID; disconnect_nvmf; killprocess $pid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $pid
-$rpc_py start_subsystem_init
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 timing_exit start_nvmf_tgt
 
diff --git a/test/nvmf/multiconnection/multiconnection.sh b/test/nvmf/multiconnection/multiconnection.sh
index fda2145deb..97155e7817 100755
--- a/test/nvmf/multiconnection/multiconnection.sh
+++ b/test/nvmf/multiconnection/multiconnection.sh
@@ -35,13 +35,12 @@ fi
 timing_enter multiconnection
 timing_enter start_nvmf_tgt
 # Start up the NVMf target in another process
-$NVMF_APP -m 0xF --wait-for-rpc &
+$NVMF_APP -m 0xF &
 pid=$!
 
 trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $pid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $pid
-$rpc_py start_subsystem_init
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 timing_exit start_nvmf_tgt
 
diff --git a/test/nvmf/nmic/nmic.sh b/test/nvmf/nmic/nmic.sh
index 6133c29b55..7b66a97748 100755
--- a/test/nvmf/nmic/nmic.sh
+++ b/test/nvmf/nmic/nmic.sh
@@ -27,13 +27,12 @@ fi
 timing_enter nmic
 timing_enter start_nvmf_tgt
 # Start up the NVMf target in another process
-$NVMF_APP -m 0xF --wait-for-rpc &
+$NVMF_APP -m 0xF &
 pid=$!
 
 trap "killprocess $pid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $pid
-$rpc_py start_subsystem_init
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 timing_exit start_nvmf_tgt
 
diff --git a/test/nvmf/nvme_cli/nvme_cli.sh b/test/nvmf/nvme_cli/nvme_cli.sh
index 3d1c1afde3..c8b40794ea 100755
--- a/test/nvmf/nvme_cli/nvme_cli.sh
+++ b/test/nvmf/nvme_cli/nvme_cli.sh
@@ -32,13 +32,12 @@ fi
 
 timing_enter nvme_cli
 timing_enter start_nvmf_tgt
-$NVMF_APP -m 0xF --wait-for-rpc &
+$NVMF_APP -m 0xF &
 nvmfpid=$!
 
 trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $nvmfpid
-$rpc_py start_subsystem_init
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 timing_exit start_nvmf_tgt
 
diff --git a/test/nvmf/rpc/rpc.sh b/test/nvmf/rpc/rpc.sh
index 467b1e9e6a..5e8837d108 100755
--- a/test/nvmf/rpc/rpc.sh
+++ b/test/nvmf/rpc/rpc.sh
@@ -23,13 +23,12 @@ fi
 timing_enter rpc
 timing_enter start_nvmf_tgt
 # Start up the NVMf target in another process
-$NVMF_APP -m 0xF --wait-for-rpc &
+$NVMF_APP -m 0xF &
 pid=$!
 
 trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $pid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $pid
-$rpc_py start_subsystem_init
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 timing_exit start_nvmf_tgt
 
diff --git a/test/nvmf/shutdown/shutdown.sh b/test/nvmf/shutdown/shutdown.sh
index d271cd24f7..f68c4b21b4 100755
--- a/test/nvmf/shutdown/shutdown.sh
+++ b/test/nvmf/shutdown/shutdown.sh
@@ -26,13 +26,12 @@ fi
 timing_enter shutdown
 timing_enter start_nvmf_tgt
 # Start up the NVMf target in another process
-$NVMF_APP -m 0xF --wait-for-rpc &
+$NVMF_APP -m 0xF &
 pid=$!
 
 trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $pid; nvmfcleanup; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $pid
-$rpc_py start_subsystem_init
 $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
 timing_exit start_nvmf_tgt