diff --git a/test/vhost/common.sh b/test/vhost/common.sh
index b461ae51e..272ba04f1 100644
--- a/test/vhost/common.sh
+++ b/test/vhost/common.sh
@@ -103,7 +103,7 @@ function spdk_vhost_list_all()
 	fi
 }
 
-function spdk_vhost_run()
+function vhost_run()
 {
 	local param
 	local vhost_num=0
diff --git a/test/vhost/fiotest/fio.sh b/test/vhost/fiotest/fio.sh
index b54d5d05d..4d7925e71 100755
--- a/test/vhost/fiotest/fio.sh
+++ b/test/vhost/fiotest/fio.sh
@@ -82,7 +82,7 @@ if [[ $test_type =~ "spdk_vhost" ]]; then
 	notice ""
 	notice "running SPDK"
 	notice ""
-	spdk_vhost_run --json-path=$testdir
+	vhost_run --json-path=$testdir
 	notice ""
 fi
 
diff --git a/test/vhost/hotplug/scsi_hotplug.sh b/test/vhost/hotplug/scsi_hotplug.sh
index 996c70199..79aa0ff3d 100755
--- a/test/vhost/hotplug/scsi_hotplug.sh
+++ b/test/vhost/hotplug/scsi_hotplug.sh
@@ -62,7 +62,7 @@ notice "==============="
 notice ""
 notice "running SPDK"
 notice ""
-spdk_vhost_run
+vhost_run
 $rpc_py set_bdev_nvme_hotplug -e
 $rpc_py construct_split_vbdev Nvme0n1 16
 $rpc_py construct_malloc_bdev 128 512 -b Malloc
diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh
index a9defe9ec..cb9b88d30 100755
--- a/test/vhost/initiator/blockdev.sh
+++ b/test/vhost/initiator/blockdev.sh
@@ -115,9 +115,9 @@ function create_bdev_config()
 	 | join(":")' <<< $vbdevs)
 }
 
-timing_enter spdk_vhost_run
-spdk_vhost_run
-timing_exit spdk_vhost_run
+timing_enter vhost_run
+vhost_run
+timing_exit vhost_run
 
 timing_enter create_bdev_config
 create_bdev_config
diff --git a/test/vhost/integrity/integrity_start.sh b/test/vhost/integrity/integrity_start.sh
index 56f5a53d4..61f10038c 100755
--- a/test/vhost/integrity/integrity_start.sh
+++ b/test/vhost/integrity/integrity_start.sh
@@ -61,7 +61,7 @@ trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
 vm_kill_all
 
 notice "Starting SPDK vhost"
-spdk_vhost_run
+vhost_run
 notice "..."
 
 # Set up lvols and vhost controllers
diff --git a/test/vhost/lvol/lvol_test.sh b/test/vhost/lvol/lvol_test.sh
index e99e3f8c9..76aaec249 100755
--- a/test/vhost/lvol/lvol_test.sh
+++ b/test/vhost/lvol/lvol_test.sh
@@ -121,7 +121,7 @@ trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
 vm_kill_all
 
 notice "running SPDK vhost"
-spdk_vhost_run
+vhost_run
 notice "..."
 
 trap 'clean_lvol_cfg; error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
diff --git a/test/vhost/migration/migration-tc1.sh b/test/vhost/migration/migration-tc1.sh
index b864e831a..61e1002dd 100644
--- a/test/vhost/migration/migration-tc1.sh
+++ b/test/vhost/migration/migration-tc1.sh
@@ -57,7 +57,7 @@ function migration_tc1()
 	local job_file="$MIGRATION_DIR/migration-tc1.job"
 
 	# Run vhost
-	spdk_vhost_run
+	vhost_run
 	migration_tc1_configure_vhost
 
 	notice "Setting up VMs"
diff --git a/test/vhost/migration/migration-tc2.sh b/test/vhost/migration/migration-tc2.sh
index 419f63dab..05c4e495f 100644
--- a/test/vhost/migration/migration-tc2.sh
+++ b/test/vhost/migration/migration-tc2.sh
@@ -102,11 +102,11 @@ function migration_tc2_configure_vhost()
 	$rootdir/scripts/gen_nvme.sh --json | $rpc_nvmf load_subsystem_config
 	timing_exit start_nvmf_tgt
 
-	spdk_vhost_run --memory=512 --vhost-num=0 --no-pci
+	vhost_run --memory=512 --vhost-num=0 --no-pci
 	# Those are global intentionally
 	vhost_1_reactor_mask=0x2
 	vhost_1_master_core=1
-	spdk_vhost_run --memory=512 --vhost-num=1 --no-pci
+	vhost_run --memory=512 --vhost-num=1 --no-pci
 
 	local rdma_ip_list=$(get_available_rdma_ips)
 	local nvmf_target_ip=$(echo "$rdma_ip_list" | head -n 1)
diff --git a/test/vhost/migration/migration-tc3a.sh b/test/vhost/migration/migration-tc3a.sh
index d8b73f79a..3857eea82 100644
--- a/test/vhost/migration/migration-tc3a.sh
+++ b/test/vhost/migration/migration-tc3a.sh
@@ -120,7 +120,7 @@ function host1_start_vhost()
 
 	notice "Starting vhost0 instance on local server"
 	trap 'host1_cleanup_vhost; error_exit "${FUNCNAME}" "${LINENO}"' INT ERR EXIT
-	spdk_vhost_run --vhost-num=0 --no-pci
+	vhost_run --vhost-num=0 --no-pci
 	$rpc_0 construct_nvme_bdev -b Nvme0 -t rdma -f ipv4 -a $RDMA_TARGET_IP -s 4420 -n "nqn.2018-02.io.spdk:cnode1"
 	$rpc_0 construct_vhost_scsi_controller $incoming_vm_ctrlr
 	$rpc_0 add_vhost_scsi_lun $incoming_vm_ctrlr 0 Nvme0n1
diff --git a/test/vhost/migration/migration-tc3b.sh b/test/vhost/migration/migration-tc3b.sh
index 71530cf3a..b1e325fbe 100644
--- a/test/vhost/migration/migration-tc3b.sh
+++ b/test/vhost/migration/migration-tc3b.sh
@@ -33,7 +33,7 @@ function host_2_start_vhost()
 
 	notice "Starting vhost 1 instance on remote server"
 	trap 'host_2_cleanup_vhost; error_exit "${FUNCNAME}" "${LINENO}"' INT ERR EXIT
-	spdk_vhost_run --vhost-num=1 --no-pci
+	vhost_run --vhost-num=1 --no-pci
 
 	$rpc construct_nvme_bdev -b Nvme0 -t rdma -f ipv4 -a $RDMA_TARGET_IP -s 4420 -n "nqn.2018-02.io.spdk:cnode1"
 	$rpc construct_vhost_scsi_controller $target_vm_ctrl
diff --git a/test/vhost/other/negative.sh b/test/vhost/other/negative.sh
index a7f12f138..67ca8455e 100755
--- a/test/vhost/other/negative.sh
+++ b/test/vhost/other/negative.sh
@@ -69,7 +69,7 @@ if [[ $RUN_NIGHTLY -eq 1 ]]; then
 	notice ""
 	notice "running SPDK"
 	notice ""
-	spdk_vhost_run --json-path=$testdir
+	vhost_run --json-path=$testdir
 	notice ""
 
 	rpc_py="$rootdir/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
diff --git a/test/vhost/perf_bench/vhost_perf.sh b/test/vhost/perf_bench/vhost_perf.sh
index 892f2c4ff..9fd2ceeaf 100755
--- a/test/vhost/perf_bench/vhost_perf.sh
+++ b/test/vhost/perf_bench/vhost_perf.sh
@@ -247,7 +247,7 @@ if [[ "$ctrl_type" == "kernel_vhost" ]]; then
 else
 	# Run vhost process and prepare split vbdevs or lvol bdevs
 	notice "running SPDK vhost"
-	spdk_vhost_run
+	vhost_run
 	notice "..."
 
 	if [[ $use_split == true ]]; then
diff --git a/test/vhost/readonly/readonly.sh b/test/vhost/readonly/readonly.sh
index 9fe868b57..48d5572e1 100755
--- a/test/vhost/readonly/readonly.sh
+++ b/test/vhost/readonly/readonly.sh
@@ -123,7 +123,7 @@ function blk_ro_tc1()
 	vm_shutdown_all
 }
 
-spdk_vhost_run
+vhost_run
 if [[ -z $x ]]; then
 	set +x
 fi
diff --git a/test/vhost/shared/shared.sh b/test/vhost/shared/shared.sh
index cfec490e1..3b05d1b72 100755
--- a/test/vhost/shared/shared.sh
+++ b/test/vhost/shared/shared.sh
@@ -21,7 +21,7 @@ vhosttestinit
 
 trap 'error_exit "${FUNCNAME}" "${LINENO}"' ERR SIGTERM SIGABRT
 
-spdk_vhost_run
+vhost_run
 
 $rpc_py construct_malloc_bdev -b Malloc 124 4096
 $rpc_py construct_vhost_blk_controller Malloc.0 Malloc
diff --git a/test/vhost/vhost_boot/vhost_boot.sh b/test/vhost/vhost_boot/vhost_boot.sh
index 76021b04f..d5786dd67 100755
--- a/test/vhost/vhost_boot/vhost_boot.sh
+++ b/test/vhost/vhost_boot/vhost_boot.sh
@@ -61,7 +61,7 @@ vhosttestinit
 timing_enter vhost_boot
 trap 'err_clean "${FUNCNAME}" "${LINENO}"' ERR
 timing_enter start_vhost
-spdk_vhost_run
+vhost_run
 timing_exit start_vhost
 
 timing_enter create_lvol
diff --git a/test/vhost/windows/windows.sh b/test/vhost/windows/windows.sh
index 95847bd15..698d469f5 100755
--- a/test/vhost/windows/windows.sh
+++ b/test/vhost/windows/windows.sh
@@ -85,11 +85,11 @@ vm_kill_all
 # Violating this rule doesn't cause any issues for SPDK vhost,
 # but triggers an assert, so we can only run Windows VMs with non-debug SPDK builds.
 notice "running SPDK vhost"
-spdk_vhost_run
+vhost_run
 notice "..."
 
 # Prepare bdevs for later vhost controllers use
-# Nvme bdev is automatically constructed during spdk_vhost_run
+# Nvme bdev is automatically constructed during vhost_run
 # by using scripts/gen_nvme.sh. No need to add it manually.
 # Using various sizes to better identify bdevs if no name in BLK
 # is available
diff --git a/test/vhost/windows/windows_scsi_compliance.sh b/test/vhost/windows/windows_scsi_compliance.sh
index b4f786550..9405ea338 100755
--- a/test/vhost/windows/windows_scsi_compliance.sh
+++ b/test/vhost/windows/windows_scsi_compliance.sh
@@ -45,8 +45,8 @@ trap "rm -f $aio_file; rm -rf $testdir/results; error_exit" SIGINT SIGTERM ERR
 mkdir -p $testdir/results
 dd if=/dev/zero of=$aio_file bs=1M count=512
 
-timing_enter spdk_vhost_run
-spdk_vhost_run
+timing_enter vhost_run
+vhost_run
 $rpc_py set_bdev_nvme_hotplug -e
 $rpc_py construct_malloc_bdev 256 4096 -b Malloc0
 $rpc_py construct_aio_bdev $aio_file Aio0 512
@@ -56,7 +56,7 @@ $rpc_py add_vhost_scsi_lun naa.vhost.1 0 Nvme0n1
 $rpc_py add_vhost_scsi_lun naa.vhost.1 1 Malloc0
 # TODO: Currently there is bug for aio device. Disable this test
 # $rpc_py add_vhost_scsi_lun naa.vhost.1 2 Aio0
-timing_exit spdk_vhost_run
+timing_exit vhost_run
 
 timing_enter start_vm
 vm_setup --force=1 --disk-type=spdk_vhost_scsi --os=$WINDOWS_IMG --disks=vhost --memory=4096