diff --git a/test/nvmf/common.sh b/test/nvmf/common.sh
index 2a073591a..001dca945 100644
--- a/test/nvmf/common.sh
+++ b/test/nvmf/common.sh
@@ -2,6 +2,7 @@ NVMF_PORT=4420
 NVMF_IP_PREFIX="192.168.100"
 NVMF_IP_LEAST_ADDR=8
 NVMF_TCP_IP_ADDRESS="127.0.0.1"
+NVMF_TRANSPORT_OPTS=""
 
 : ${NVMF_APP_SHM_ID="0"}; export NVMF_APP_SHM_ID
 : ${NVMF_APP="./app/nvmf_tgt/nvmf_tgt -i $NVMF_APP_SHM_ID -e 0xFFFF"}; export NVMF_APP
@@ -169,6 +170,8 @@ function nvmftestinit()
 			rdma_device_init
 		fi
 	fi
+
+	NVMF_TRANSPORT_OPTS="-t $TEST_TRANSPORT"
 	if [ "$TEST_TRANSPORT" == "rdma" ]; then
 		RDMA_IP_LIST=$(get_available_rdma_ips)
 		NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
diff --git a/test/nvmf/host/aer.sh b/test/nvmf/host/aer.sh
index 522493ff4..5f4d985ce 100755
--- a/test/nvmf/host/aer.sh
+++ b/test/nvmf/host/aer.sh
@@ -11,7 +11,7 @@ timing_enter aer
 nvmftestinit
 nvmfappstart "-m 0xF"
 
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
 $rpc_py construct_malloc_bdev 64 512 --name Malloc0
 $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001 -m 2
diff --git a/test/nvmf/host/bdevperf.sh b/test/nvmf/host/bdevperf.sh
index bcb184c74..4212f6e5b 100755
--- a/test/nvmf/host/bdevperf.sh
+++ b/test/nvmf/host/bdevperf.sh
@@ -21,7 +21,7 @@ nvmfpid=$!
 trap "process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $nvmfpid
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 timing_exit start_nvmf_tgt
 
 $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
diff --git a/test/nvmf/host/fio.sh b/test/nvmf/host/fio.sh
index 7de9bcc8e..0d697aa1d 100755
--- a/test/nvmf/host/fio.sh
+++ b/test/nvmf/host/fio.sh
@@ -24,7 +24,7 @@ nvmfpid=$!
 trap "process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $nvmfpid
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 timing_exit start_nvmf_tgt
 
 $rpc_py construct_malloc_bdev 64 512 -b Malloc1
diff --git a/test/nvmf/host/identify.sh b/test/nvmf/host/identify.sh
index fca72f740..586759cc1 100755
--- a/test/nvmf/host/identify.sh
+++ b/test/nvmf/host/identify.sh
@@ -21,7 +21,7 @@ nvmfpid=$!
 trap "process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $nvmfpid
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 timing_exit start_nvmf_tgt
 
 $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
diff --git a/test/nvmf/host/perf.sh b/test/nvmf/host/perf.sh
index e487a9c4e..02d6d7a07 100755
--- a/test/nvmf/host/perf.sh
+++ b/test/nvmf/host/perf.sh
@@ -24,7 +24,7 @@ if [ -n "$local_nvme_trid" ]; then
 	bdevs="$bdevs Nvme0n1"
 fi
 
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS
 $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001
 for bdev in $bdevs; do
 	$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 $bdev
diff --git a/test/nvmf/target/bdev_io_wait.sh b/test/nvmf/target/bdev_io_wait.sh
index 9d59200c5..1d0eb58ee 100755
--- a/test/nvmf/target/bdev_io_wait.sh
+++ b/test/nvmf/target/bdev_io_wait.sh
@@ -17,7 +17,7 @@ nvmfappstart "-m 0xF --wait-for-rpc"
 # Minimal number of bdev io pool (5) and cache (1)
 $rpc_py set_bdev_options -p 5 -c 1
 $rpc_py start_subsystem_init
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
 $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
 $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001
diff --git a/test/nvmf/target/bdevio.sh b/test/nvmf/target/bdevio.sh
index 80db53de0..1b917f514 100755
--- a/test/nvmf/target/bdevio.sh
+++ b/test/nvmf/target/bdevio.sh
@@ -14,7 +14,7 @@ timing_enter bdevio
 nvmftestinit
 nvmfappstart "-m 0xF"
 
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
 $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001
 $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc0
diff --git a/test/nvmf/target/connect_disconnect.sh b/test/nvmf/target/connect_disconnect.sh
index 2a0c31a48..ad72f4120 100755
--- a/test/nvmf/target/connect_disconnect.sh
+++ b/test/nvmf/target/connect_disconnect.sh
@@ -16,7 +16,7 @@ timing_enter connect_disconnect
 nvmftestinit
 nvmfappstart "-m 0xF"
 
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192 -c 0
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192 -c 0
 
 bdev="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"
 
diff --git a/test/nvmf/target/create_transport.sh b/test/nvmf/target/create_transport.sh
index c19943cb7..42bddbbd7 100755
--- a/test/nvmf/target/create_transport.sh
+++ b/test/nvmf/target/create_transport.sh
@@ -20,7 +20,7 @@ nvmftestinit
 nvmfappstart "-m 0xF"
 
 # Use nvmf_create_transport call to create transport
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
 null_bdevs="$($rpc_py construct_null_bdev Null0 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE) "
 null_bdevs+="$($rpc_py construct_null_bdev Null1 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE)"
diff --git a/test/nvmf/target/discovery.sh b/test/nvmf/target/discovery.sh
index e5dbcb66c..735e55776 100755
--- a/test/nvmf/target/discovery.sh
+++ b/test/nvmf/target/discovery.sh
@@ -19,7 +19,7 @@ timing_enter discovery
 nvmftestinit
 nvmfappstart "-m 0xF"
 
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
 null_bdevs="$($rpc_py construct_null_bdev Null0 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE) "
 null_bdevs+="$($rpc_py construct_null_bdev Null1 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE)"
diff --git a/test/nvmf/target/filesystem.sh b/test/nvmf/target/filesystem.sh
index bdf503ccb..532fe89fb 100755
--- a/test/nvmf/target/filesystem.sh
+++ b/test/nvmf/target/filesystem.sh
@@ -17,7 +17,7 @@ nvmftestinit
 for incapsule in 0 4096; do
 	nvmfappstart "-m 0xF"
 
-	$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192 -c $incapsule
+	$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192 -c $incapsule
 
 	$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc1
 	$rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001
diff --git a/test/nvmf/target/fio.sh b/test/nvmf/target/fio.sh
index 02ccecfa6..c70a3754e 100755
--- a/test/nvmf/target/fio.sh
+++ b/test/nvmf/target/fio.sh
@@ -14,7 +14,7 @@ timing_enter fio
 nvmftestinit
 nvmfappstart "-m 0xF"
 
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
 malloc_bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "
 malloc_bdevs+="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"
diff --git a/test/nvmf/target/fuzz.sh b/test/nvmf/target/fuzz.sh
index 0c879f6e1..a9ddb9467 100755
--- a/test/nvmf/target/fuzz.sh
+++ b/test/nvmf/target/fuzz.sh
@@ -17,7 +17,7 @@ nvmfpid=$!
 trap "process_shm --id $NVMF_APP_SHM_ID; rm -f $testdir/nvmf_fuzz.conf; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $nvmfpid
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
 $rpc_py construct_malloc_bdev -b Malloc0 64 512
 
diff --git a/test/nvmf/target/multiconnection.sh b/test/nvmf/target/multiconnection.sh
index 47e6f9fc0..49fde0cc0 100755
--- a/test/nvmf/target/multiconnection.sh
+++ b/test/nvmf/target/multiconnection.sh
@@ -24,7 +24,7 @@ if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
 	NVMF_SUBSYS=1
 fi
 
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
 for i in $(seq 1 $NVMF_SUBSYS)
 do
diff --git a/test/nvmf/target/nmic.sh b/test/nvmf/target/nmic.sh
index 019df3b5c..32eb73d9f 100755
--- a/test/nvmf/target/nmic.sh
+++ b/test/nvmf/target/nmic.sh
@@ -16,7 +16,7 @@ nvmfappstart "-m 0xF"
 
 NVMF_SECOND_TARGET_IP=$(echo "$RDMA_IP_LIST" | sed -n 2p)
 
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
 # Create subsystems
 $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
diff --git a/test/nvmf/target/nvme_cli.sh b/test/nvmf/target/nvme_cli.sh
index a813a5cd6..aee3bf6bc 100755
--- a/test/nvmf/target/nvme_cli.sh
+++ b/test/nvmf/target/nvme_cli.sh
@@ -21,7 +21,7 @@ timing_enter nvme_cli
 nvmftestinit
 nvmfappstart "-m 0xF"
 
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
 $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
 $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc1
diff --git a/test/nvmf/target/nvmf_lvol.sh b/test/nvmf/target/nvmf_lvol.sh
index d96d9eeba..b58d53dcd 100755
--- a/test/nvmf/target/nvmf_lvol.sh
+++ b/test/nvmf/target/nvmf_lvol.sh
@@ -24,7 +24,7 @@ if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
 	SUBSYS_NR=1
 fi
 
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
 # Construct a RAID volume for the logical volume store
 base_bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "
diff --git a/test/nvmf/target/nvmf_vhost.sh b/test/nvmf/target/nvmf_vhost.sh
index 535804f70..e95907911 100755
--- a/test/nvmf/target/nvmf_vhost.sh
+++ b/test/nvmf/target/nvmf_vhost.sh
@@ -42,7 +42,7 @@ trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $vhostpid nvmftestfini; exi
 # Configure NVMF tgt on host machine
 malloc_bdev="$($NVMF_RPC construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"
 
-$NVMF_RPC nvmf_create_transport -t $TEST_TRANSPORT -u 8192 -p 4
+$NVMF_RPC nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192 -p 4
 $NVMF_RPC nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001
 $NVMF_RPC nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 "$malloc_bdev"
 $NVMF_RPC nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT
diff --git a/test/nvmf/target/rpc.sh b/test/nvmf/target/rpc.sh
index 0841bdf17..2d668f7b1 100755
--- a/test/nvmf/target/rpc.sh
+++ b/test/nvmf/target/rpc.sh
@@ -11,7 +11,7 @@ timing_enter rpc
 nvmftestinit
 nvmfappstart "-m 0xF"
 
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
 # set times for subsystem construct/delete
 if [ $RUN_NIGHTLY -eq 1 ]; then
diff --git a/test/nvmf/target/shutdown.sh b/test/nvmf/target/shutdown.sh
index 55ea0197c..cf062e8b3 100755
--- a/test/nvmf/target/shutdown.sh
+++ b/test/nvmf/target/shutdown.sh
@@ -38,7 +38,7 @@ timing_enter shutdown
 nvmftestinit
 nvmfappstart "-m 0xF"
 
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
 num_subsystems=10
 # SoftRoce does not have enough queues available for
diff --git a/test/nvmf/target/srq_overwhelm.sh b/test/nvmf/target/srq_overwhelm.sh
index d7ea0a92c..1c3eef432 100755
--- a/test/nvmf/target/srq_overwhelm.sh
+++ b/test/nvmf/target/srq_overwhelm.sh
@@ -21,7 +21,7 @@ fi
 nvmfappstart "-m 0xF"
 
 # create the rdma transport with an intentionally small SRQ depth
-$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192 -s 1024
+$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192 -s 1024
 
 for i in $(seq 0 5); do
 	$rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode$i -a -s SPDK00000000000001