diff --git a/test/bdev/bdev_raid.sh b/test/bdev/bdev_raid.sh
index f69083488..629f3218f 100755
--- a/test/bdev/bdev_raid.sh
+++ b/test/bdev/bdev_raid.sh
@@ -3,12 +3,13 @@
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
 rpc_server=/var/tmp/spdk-raid.sock
-rpc_py="$rootdir/scripts/rpc.py -s $rpc_server"
 tmp_file=$SPDK_TEST_STORAGE/raidrandtest
 
 source $rootdir/test/common/autotest_common.sh
 source $testdir/nbd_common.sh
 
+rpc_py="$rootdir/scripts/rpc.py -s $rpc_server"
+
 function raid_unmap_data_verify() {
 	if hash blkdiscard; then
 		local nbd=$1
diff --git a/test/blobstore/blob_io_wait/blob_io_wait.sh b/test/blobstore/blob_io_wait/blob_io_wait.sh
index ea86035a1..4a62f5ed6 100755
--- a/test/blobstore/blob_io_wait/blob_io_wait.sh
+++ b/test/blobstore/blob_io_wait/blob_io_wait.sh
@@ -9,7 +9,6 @@ fi
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
-rpc_py="$rootdir/scripts/rpc.py"
 
 truncate -s 64M $testdir/aio.bdev
 
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index d9593f59d..530988490 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+rpc_py=rpc_cmd
+
 function xtrace_fd() {
 	if [[ -n $BASH_XTRACEFD && -e /proc/self/fd/$BASH_XTRACEFD ]]; then
 		# Close it first to make sure it's sane
diff --git a/test/compress/compress.sh b/test/compress/compress.sh
index 0430de049..4ac815583 100755
--- a/test/compress/compress.sh
+++ b/test/compress/compress.sh
@@ -5,10 +5,10 @@ set -e
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
 plugindir=$rootdir/examples/bdev/fio_plugin
-rpc_py="$rootdir/scripts/rpc.py"
 source "$rootdir/scripts/common.sh"
 source "$rootdir/test/common/autotest_common.sh"
 source "$rootdir/test/nvmf/common.sh"
+rpc_py="$rootdir/scripts/rpc.py"
 
 function error_cleanup() {
 	# force delete pmem file and wipe on-disk metadata
diff --git a/test/dpdk_memory_utility/test_dpdk_mem_info.sh b/test/dpdk_memory_utility/test_dpdk_mem_info.sh
index 59bea5314..f581ddb4a 100755
--- a/test/dpdk_memory_utility/test_dpdk_mem_info.sh
+++ b/test/dpdk_memory_utility/test_dpdk_mem_info.sh
@@ -4,7 +4,6 @@ testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
 source $rootdir/test/common/autotest_common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
 MEM_SCRIPT="$rootdir/scripts/dpdk_mem_info.py"
 
 "${SPDK_APP[@]}" &
diff --git a/test/fuzz/autofuzz_iscsi.sh b/test/fuzz/autofuzz_iscsi.sh
index 9748e07ec..645f1db5d 100755
--- a/test/fuzz/autofuzz_iscsi.sh
+++ b/test/fuzz/autofuzz_iscsi.sh
@@ -22,8 +22,6 @@ timing_enter iscsi_fuzz_test
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=4096
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 TEST_TIMEOUT=1200
 
 # This argument is used in addition to the test arguments in autotest_common.sh
diff --git a/test/fuzz/autofuzz_nvmf.sh b/test/fuzz/autofuzz_nvmf.sh
index a9b447552..948712e6b 100755
--- a/test/fuzz/autofuzz_nvmf.sh
+++ b/test/fuzz/autofuzz_nvmf.sh
@@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 TEST_TIMEOUT=1200
 
 # This argument is used in addition to the test arguments in autotest_common.sh
diff --git a/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh b/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
index 9e78e259e..1a0048987 100755
--- a/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
+++ b/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
@@ -10,8 +10,6 @@ iscsitestinit
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 timing_enter start_iscsi_tgt
 
 "${ISCSI_APP[@]}" -m 0x2 -p 1 -s 512 --wait-for-rpc &
diff --git a/test/iscsi_tgt/digests/digests.sh b/test/iscsi_tgt/digests/digests.sh
index 6bbedd3e3..3769e3fc0 100755
--- a/test/iscsi_tgt/digests/digests.sh
+++ b/test/iscsi_tgt/digests/digests.sh
@@ -46,7 +46,6 @@ function iscsi_header_data_digest_test() {
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
 fio_py="$rootdir/scripts/fio-wrapper"
 
 timing_enter start_iscsi_tgt
diff --git a/test/iscsi_tgt/ext4test/ext4test.sh b/test/iscsi_tgt/ext4test/ext4test.sh
index 7493a771f..4fd9648c6 100755
--- a/test/iscsi_tgt/ext4test/ext4test.sh
+++ b/test/iscsi_tgt/ext4test/ext4test.sh
@@ -7,7 +7,6 @@ source $rootdir/test/iscsi_tgt/common.sh
 
 iscsitestinit
 
-rpc_py="$rootdir/scripts/rpc.py"
 node_base="iqn.2013-06.com.intel.ch.spdk"
 
 timing_enter start_iscsi_tgt
diff --git a/test/iscsi_tgt/filesystem/filesystem.sh b/test/iscsi_tgt/filesystem/filesystem.sh
index 2b7e9f586..7bc32c704 100755
--- a/test/iscsi_tgt/filesystem/filesystem.sh
+++ b/test/iscsi_tgt/filesystem/filesystem.sh
@@ -9,7 +9,6 @@ source $rootdir/scripts/common.sh
 
 iscsitestinit
 
-rpc_py="$rootdir/scripts/rpc.py"
 # Remove lvol bdevs and stores.
 function remove_backends() {
 	echo "INFO: Removing lvol bdev"
diff --git a/test/iscsi_tgt/fio/fio.sh b/test/iscsi_tgt/fio/fio.sh
index 4710de1f6..bbd8a4184 100755
--- a/test/iscsi_tgt/fio/fio.sh
+++ b/test/iscsi_tgt/fio/fio.sh
@@ -54,7 +54,6 @@ fi
 
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=4096
-
 rpc_py="$rootdir/scripts/rpc.py"
 fio_py="$rootdir/scripts/fio-wrapper"
 
diff --git a/test/iscsi_tgt/fuzz/fuzz.sh b/test/iscsi_tgt/fuzz/fuzz.sh
index 03237a909..609f4ce7e 100755
--- a/test/iscsi_tgt/fuzz/fuzz.sh
+++ b/test/iscsi_tgt/fuzz/fuzz.sh
@@ -22,8 +22,6 @@ timing_enter iscsi_fuzz
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=4096
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 timing_enter start_iscsi_tgt
 
 "${ISCSI_APP[@]}" -m $ISCSI_TEST_CORE_MASK --wait-for-rpc &
diff --git a/test/iscsi_tgt/initiator/initiator.sh b/test/iscsi_tgt/initiator/initiator.sh
index 90a37c98d..0a1b73029 100755
--- a/test/iscsi_tgt/initiator/initiator.sh
+++ b/test/iscsi_tgt/initiator/initiator.sh
@@ -10,8 +10,6 @@ iscsitestinit
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 timing_enter start_iscsi_tgt
 
 "${ISCSI_APP[@]}" -m 0x2 -p 1 -s 512 --wait-for-rpc &
diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh
index c71cb238c..649b62605 100755
--- a/test/iscsi_tgt/ip_migration/ip_migration.sh
+++ b/test/iscsi_tgt/ip_migration/ip_migration.sh
@@ -7,7 +7,6 @@ source $rootdir/test/iscsi_tgt/common.sh
 
 iscsitestinit
 
-rpc_py="$rootdir/scripts/rpc.py"
 fio_py="$rootdir/scripts/fio-wrapper"
 pids=()
 
diff --git a/test/iscsi_tgt/multiconnection/multiconnection.sh b/test/iscsi_tgt/multiconnection/multiconnection.sh
index a1fc43933..35aded32a 100755
--- a/test/iscsi_tgt/multiconnection/multiconnection.sh
+++ b/test/iscsi_tgt/multiconnection/multiconnection.sh
@@ -7,7 +7,6 @@ source $rootdir/test/iscsi_tgt/common.sh
 
 iscsitestinit
 
-rpc_py="$rootdir/scripts/rpc.py"
 fio_py="$rootdir/scripts/fio-wrapper"
 
 CONNECTION_NUMBER=30
diff --git a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
index 39ce71804..2af90a44a 100755
--- a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
+++ b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
@@ -9,7 +9,6 @@ source $rootdir/test/iscsi_tgt/common.sh
 nvmftestinit
 iscsitestinit
 
-rpc_py="$rootdir/scripts/rpc.py"
 fio_py="$rootdir/scripts/fio-wrapper"
 
 # Namespaces are NOT used here on purpose. Rxe_cfg utility used for NVMf tests do not support namespaces.
diff --git a/test/iscsi_tgt/pmem/iscsi_pmem.sh b/test/iscsi_tgt/pmem/iscsi_pmem.sh
index 66c3de738..cf64e2d1f 100755
--- a/test/iscsi_tgt/pmem/iscsi_pmem.sh
+++ b/test/iscsi_tgt/pmem/iscsi_pmem.sh
@@ -12,7 +12,6 @@ PMEM_SIZE=128
 PMEM_BLOCK_SIZE=512
 TGT_NR=10
 PMEM_PER_TGT=1
-rpc_py="$rootdir/scripts/rpc.py"
 fio_py="$rootdir/scripts/fio-wrapper"
 
 timing_enter start_iscsi_target
diff --git a/test/iscsi_tgt/qos/qos.sh b/test/iscsi_tgt/qos/qos.sh
index 31092d5f3..f1e9f5515 100755
--- a/test/iscsi_tgt/qos/qos.sh
+++ b/test/iscsi_tgt/qos/qos.sh
@@ -52,7 +52,6 @@ MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 IOPS_RESULT=
 BANDWIDTH_RESULT=
-rpc_py="$rootdir/scripts/rpc.py"
 fio_py="$rootdir/scripts/fio-wrapper"
 
 timing_enter start_iscsi_tgt
diff --git a/test/iscsi_tgt/rbd/rbd.sh b/test/iscsi_tgt/rbd/rbd.sh
index 6ed1dfa57..752e9f026 100755
--- a/test/iscsi_tgt/rbd/rbd.sh
+++ b/test/iscsi_tgt/rbd/rbd.sh
@@ -12,7 +12,6 @@ rbd_setup $TARGET_IP $TARGET_NAMESPACE
 trap 'rbd_cleanup; exit 1' SIGINT SIGTERM EXIT
 timing_exit rbd_setup
 
-rpc_py="$rootdir/scripts/rpc.py"
 fio_py="$rootdir/scripts/fio-wrapper"
 
 timing_enter start_iscsi_tgt
diff --git a/test/iscsi_tgt/reset/reset.sh b/test/iscsi_tgt/reset/reset.sh
index 5ed96eea8..969bd1d12 100755
--- a/test/iscsi_tgt/reset/reset.sh
+++ b/test/iscsi_tgt/reset/reset.sh
@@ -10,7 +10,6 @@ iscsitestinit
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
 fio_py="$rootdir/scripts/fio-wrapper"
 
 if ! hash sg_reset; then
diff --git a/test/iscsi_tgt/resize/resize.sh b/test/iscsi_tgt/resize/resize.sh
index fa4dbc45b..7436e0d34 100755
--- a/test/iscsi_tgt/resize/resize.sh
+++ b/test/iscsi_tgt/resize/resize.sh
@@ -12,8 +12,6 @@ BDEV_NEW_SIZE=128
 BLOCK_SIZE=512
 RESIZE_SOCK="/var/tmp/spdk-resize.sock"
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 timing_enter start_iscsi_tgt
 
 # Remove the sock file first
diff --git a/test/nvme/compliance/compliance.sh b/test/nvme/compliance/compliance.sh
index 8f067bdf1..9061d3b68 100755
--- a/test/nvme/compliance/compliance.sh
+++ b/test/nvme/compliance/compliance.sh
@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 export TEST_TRANSPORT=VFIOUSER
 
 rm -rf /var/run/vfio-user
diff --git a/test/nvme/nvme_opal.sh b/test/nvme/nvme_opal.sh
index 3fba5c11a..154c821cc 100755
--- a/test/nvme/nvme_opal.sh
+++ b/test/nvme/nvme_opal.sh
@@ -4,7 +4,6 @@ set -e
 
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
-rpc_py="$rootdir/scripts/rpc.py"
 source "$rootdir/scripts/common.sh"
 source "$rootdir/test/common/autotest_common.sh"
 
diff --git a/test/nvmf/host/aer.sh b/test/nvmf/host/aer.sh
index 1c438c686..24dd781d4 100755
--- a/test/nvmf/host/aer.sh
+++ b/test/nvmf/host/aer.sh
@@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 nvmfappstart -m 0xF
 
diff --git a/test/nvmf/host/bdevperf.sh b/test/nvmf/host/bdevperf.sh
index 1a544a002..a166eac24 100755
--- a/test/nvmf/host/bdevperf.sh
+++ b/test/nvmf/host/bdevperf.sh
@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 function tgt_init() {
 	nvmfappstart -m 0xF
 
diff --git a/test/nvmf/host/discovery.sh b/test/nvmf/host/discovery.sh
index 53bd05fd8..b7a89f60d 100755
--- a/test/nvmf/host/discovery.sh
+++ b/test/nvmf/host/discovery.sh
@@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 if [ "$TEST_TRANSPORT" == "rdma" ]; then
 	echo "Skipping tests on RDMA because the rdma stack fails to configure the same IP for host and target."
 	exit 0
diff --git a/test/nvmf/host/dma.sh b/test/nvmf/host/dma.sh
index c94d717a8..ba3a90cc7 100755
--- a/test/nvmf/host/dma.sh
+++ b/test/nvmf/host/dma.sh
@@ -12,7 +12,6 @@ fi
 MALLOC_BDEV_SIZE=256
 MALLOC_BLOCK_SIZE=512
 subsystem="0"
-rpc_py="$rootdir/scripts/rpc.py"
 
 function gen_malloc_json() {
 	jq . <<- JSON
diff --git a/test/nvmf/host/fio.sh b/test/nvmf/host/fio.sh
index 2a255b429..61f8022e9 100755
--- a/test/nvmf/host/fio.sh
+++ b/test/nvmf/host/fio.sh
@@ -6,8 +6,6 @@ source $rootdir/test/common/autotest_common.sh
 source $rootdir/scripts/common.sh
 source $rootdir/test/nvmf/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 
 if [[ $CONFIG_FIO_PLUGIN != y ]]; then
diff --git a/test/nvmf/host/identify.sh b/test/nvmf/host/identify.sh
index 410fbb8ae..9ec8f8fd7 100755
--- a/test/nvmf/host/identify.sh
+++ b/test/nvmf/host/identify.sh
@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 
 timing_enter start_nvmf_tgt
diff --git a/test/nvmf/host/multicontroller.sh b/test/nvmf/host/multicontroller.sh
index da12667de..8c1ff2b5e 100755
--- a/test/nvmf/host/multicontroller.sh
+++ b/test/nvmf/host/multicontroller.sh
@@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 NVMF_HOST_FIRST_PORT="60000"
diff --git a/test/nvmf/host/target_disconnect.sh b/test/nvmf/host/target_disconnect.sh
index 2f0faae29..a681b5dad 100755
--- a/test/nvmf/host/target_disconnect.sh
+++ b/test/nvmf/host/target_disconnect.sh
@@ -10,8 +10,6 @@ PLUGIN_DIR=$rootdir/examples/nvme/fio_plugin
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 function disconnect_init() {
 	nvmfappstart -m 0xF0
 
diff --git a/test/nvmf/target/abort.sh b/test/nvmf/target/abort.sh
index e4ffd1c73..6531da558 100755
--- a/test/nvmf/target/abort.sh
+++ b/test/nvmf/target/abort.sh
@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=4096
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 nvmfappstart -m 0xE
 
diff --git a/test/nvmf/target/bdev_io_wait.sh b/test/nvmf/target/bdev_io_wait.sh
index e57ffc36d..19f0e728a 100755
--- a/test/nvmf/target/bdev_io_wait.sh
+++ b/test/nvmf/target/bdev_io_wait.sh
@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 nvmfappstart -m 0xF --wait-for-rpc
 
diff --git a/test/nvmf/target/bdevio.sh b/test/nvmf/target/bdevio.sh
index f4d7eb1b5..25f4efec0 100755
--- a/test/nvmf/target/bdevio.sh
+++ b/test/nvmf/target/bdevio.sh
@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 # Don't use cores 0 - 2 to avoid overlap with bdevio.
 nvmfappstart -m 0x78
diff --git a/test/nvmf/target/connect_disconnect.sh b/test/nvmf/target/connect_disconnect.sh
index 931582ea9..12c4e4202 100755
--- a/test/nvmf/target/connect_disconnect.sh
+++ b/test/nvmf/target/connect_disconnect.sh
@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 # connect disconnect is geared towards ensuring that we are properly freeing resources after disconnecting qpairs.
 nvmftestinit
 nvmfappstart -m 0xF
diff --git a/test/nvmf/target/connect_stress.sh b/test/nvmf/target/connect_stress.sh
index 75d08f95a..8c218d90f 100755
--- a/test/nvmf/target/connect_stress.sh
+++ b/test/nvmf/target/connect_stress.sh
@@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 nvmfappstart -m 0xE
 
diff --git a/test/nvmf/target/delete_subsystem.sh b/test/nvmf/target/delete_subsystem.sh
index 32c89ebd0..e79cdbd8f 100755
--- a/test/nvmf/target/delete_subsystem.sh
+++ b/test/nvmf/target/delete_subsystem.sh
@@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 nvmfappstart -m 0x3
 
diff --git a/test/nvmf/target/discovery.sh b/test/nvmf/target/discovery.sh
index f41d29157..755adc28c 100755
--- a/test/nvmf/target/discovery.sh
+++ b/test/nvmf/target/discovery.sh
@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 NULL_BDEV_SIZE=102400
 NULL_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 if ! hash nvme; then
 	echo "nvme command not found; skipping discovery test"
 	exit 0
diff --git a/test/nvmf/target/fabrics_fuzz.sh b/test/nvmf/target/fabrics_fuzz.sh
index faed30397..e2ca0b65e 100755
--- a/test/nvmf/target/fabrics_fuzz.sh
+++ b/test/nvmf/target/fabrics_fuzz.sh
@@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 
 "${NVMF_APP[@]}" -m 0x1 > $output_dir/nvmf_fuzz_tgt_output.txt 2>&1 &
diff --git a/test/nvmf/target/filesystem.sh b/test/nvmf/target/filesystem.sh
index d3c09c3c4..3df6badab 100755
--- a/test/nvmf/target/filesystem.sh
+++ b/test/nvmf/target/filesystem.sh
@@ -9,8 +9,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=128
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 
 function nvmf_filesystem_create() {
diff --git a/test/nvmf/target/fused_ordering.sh b/test/nvmf/target/fused_ordering.sh
index 173485f12..1cb22a820 100755
--- a/test/nvmf/target/fused_ordering.sh
+++ b/test/nvmf/target/fused_ordering.sh
@@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 nvmfappstart -m 0x2
 
diff --git a/test/nvmf/target/host_management.sh b/test/nvmf/target/host_management.sh
index a3cb66f97..9a817caeb 100755
--- a/test/nvmf/target/host_management.sh
+++ b/test/nvmf/target/host_management.sh
@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 function starttarget() {
 	# Start the target
 	nvmfappstart -m 0x1E
diff --git a/test/nvmf/target/identify_passthru.sh b/test/nvmf/target/identify_passthru.sh
index c6f19e521..081c8c977 100755
--- a/test/nvmf/target/identify_passthru.sh
+++ b/test/nvmf/target/identify_passthru.sh
@@ -6,8 +6,6 @@ source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 source $rootdir/scripts/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 
 timing_enter nvme_identify
diff --git a/test/nvmf/target/initiator_timeout.sh b/test/nvmf/target/initiator_timeout.sh
index 12c759c64..9c937ab38 100755
--- a/test/nvmf/target/initiator_timeout.sh
+++ b/test/nvmf/target/initiator_timeout.sh
@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 nvmfappstart -m 0xF
 
diff --git a/test/nvmf/target/multiconnection.sh b/test/nvmf/target/multiconnection.sh
index 70da110d3..43b24d404 100755
--- a/test/nvmf/target/multiconnection.sh
+++ b/test/nvmf/target/multiconnection.sh
@@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512
 
 NVMF_SUBSYS=11
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 nvmfappstart -m 0xF
 
diff --git a/test/nvmf/target/nmic.sh b/test/nvmf/target/nmic.sh
index dd0b07479..dd3f7f381 100755
--- a/test/nvmf/target/nmic.sh
+++ b/test/nvmf/target/nmic.sh
@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 nvmfappstart -m 0xF
 
diff --git a/test/nvmf/target/nvme_cli.sh b/test/nvmf/target/nvme_cli.sh
index 6c71d75fc..401f0d64f 100755
--- a/test/nvmf/target/nvme_cli.sh
+++ b/test/nvmf/target/nvme_cli.sh
@@ -13,7 +13,6 @@ fi
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
 devs=()
 
 nvmftestinit
diff --git a/test/nvmf/target/nvmf_example.sh b/test/nvmf/target/nvmf_example.sh
index 6322485a3..d7ba77b7f 100755
--- a/test/nvmf/target/nvmf_example.sh
+++ b/test/nvmf/target/nvmf_example.sh
@@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 NVMF_EXAMPLE=("$SPDK_EXAMPLE_DIR/nvmf")
 
 MALLOC_BDEV_SIZE=64
diff --git a/test/nvmf/target/perf_adq.sh b/test/nvmf/target/perf_adq.sh
index 5d402b2b3..2e8285f95 100755
--- a/test/nvmf/target/perf_adq.sh
+++ b/test/nvmf/target/perf_adq.sh
@@ -12,7 +12,6 @@ if ((${#TCP_INTERFACE_LIST[@]} == 0)); then
 	exit 1
 fi
 
-rpc_py="$rootdir/scripts/rpc.py"
 perf="$SPDK_EXAMPLE_DIR/perf"
 
 function adq_configure_driver() {
diff --git a/test/nvmf/target/queue_depth.sh b/test/nvmf/target/queue_depth.sh
index 3268fa18c..4c5af5f9d 100755
--- a/test/nvmf/target/queue_depth.sh
+++ b/test/nvmf/target/queue_depth.sh
@@ -10,8 +10,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 bdevperf_rpc_sock=/var/tmp/bdevperf.sock
 
 nvmftestinit
diff --git a/test/nvmf/target/rpc.sh b/test/nvmf/target/rpc.sh
index 0a1ea0533..afabae854 100755
--- a/test/nvmf/target/rpc.sh
+++ b/test/nvmf/target/rpc.sh
@@ -5,7 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
 loops=5
 
 function jcount() {
diff --git a/test/nvmf/target/shutdown.sh b/test/nvmf/target/shutdown.sh
index a625708de..fd28424ff 100755
--- a/test/nvmf/target/shutdown.sh
+++ b/test/nvmf/target/shutdown.sh
@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 function starttarget() {
 	nvmftestinit
 
diff --git a/test/nvmf/target/srq_overwhelm.sh b/test/nvmf/target/srq_overwhelm.sh
index 63e7d315b..046df4cf1 100755
--- a/test/nvmf/target/srq_overwhelm.sh
+++ b/test/nvmf/target/srq_overwhelm.sh
@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 
 nvmfappstart -m 0xF
diff --git a/test/nvmf/target/vfio_user_fuzz.sh b/test/nvmf/target/vfio_user_fuzz.sh
index 22a6e97d7..d536ece20 100755
--- a/test/nvmf/target/vfio_user_fuzz.sh
+++ b/test/nvmf/target/vfio_user_fuzz.sh
@@ -8,7 +8,6 @@ source $rootdir/test/nvmf/common.sh
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=512
 
-rpc_py="$rootdir/scripts/rpc.py"
 nqn=nqn.2021-09.io.spdk:cnode0
 traddr=/var/run/vfio-user
 
diff --git a/test/nvmf/target/zcopy.sh b/test/nvmf/target/zcopy.sh
index 70bd9c9c4..602b40da5 100755
--- a/test/nvmf/target/zcopy.sh
+++ b/test/nvmf/target/zcopy.sh
@@ -6,8 +6,6 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py"
-
 nvmftestinit
 nvmfappstart
 
diff --git a/test/ocf/integrity/bdevperf-iotypes.sh b/test/ocf/integrity/bdevperf-iotypes.sh
index 2effa21bd..d5e5e2782 100755
--- a/test/ocf/integrity/bdevperf-iotypes.sh
+++ b/test/ocf/integrity/bdevperf-iotypes.sh
@@ -5,7 +5,6 @@ rootdir=$(readlink -f $curdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 
 bdevperf=$rootdir/test/bdev/bdevperf/bdevperf
-rpc_py="$rootdir/scripts/rpc.py"
 
 source "$curdir/mallocs.conf"
 $bdevperf --json <(gen_malloc_ocf_json) -q 128 -o 4096 -t 4 -w flush
diff --git a/test/ocf/integrity/stats.sh b/test/ocf/integrity/stats.sh
index c82f89d89..736b047aa 100755
--- a/test/ocf/integrity/stats.sh
+++ b/test/ocf/integrity/stats.sh
@@ -5,7 +5,6 @@ rootdir=$(readlink -f $curdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 
 bdevperf=$rootdir/test/bdev/bdevperf/bdevperf
-rpc_py="$rootdir/scripts/rpc.py"
 
 source "$curdir/mallocs.conf"
 $bdevperf --json <(gen_malloc_ocf_json) -q 128 -o 4096 -w write -t 120 -r /var/tmp/spdk.sock &
diff --git a/test/sma/discovery.sh b/test/sma/discovery.sh
index b6cb20698..8547450ab 100755
--- a/test/sma/discovery.sh
+++ b/test/sma/discovery.sh
@@ -6,8 +6,8 @@ rootdir=$(readlink -f "$testdir/../..")
 source "$rootdir/test/common/autotest_common.sh"
 source "$testdir/common.sh"
 
-rpc_py="$rootdir/scripts/rpc.py"
 sma_py="$rootdir/scripts/sma-client.py"
+rpc_py="$rootdir/scripts/rpc.py"
 
 t1sock='/var/tmp/spdk.sock1'
 t2sock='/var/tmp/spdk.sock2'