diff --git a/test/vhost/common/common.sh b/test/vhost/common.sh
similarity index 99%
rename from test/vhost/common/common.sh
rename to test/vhost/common.sh
index fcc4fbfd3..0f7624ef7 100644
--- a/test/vhost/common/common.sh
+++ b/test/vhost/common.sh
@@ -6,10 +6,10 @@ set -e
 BASE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 
 # Default running dir -> spdk/..
-[[ -z "$TEST_DIR" ]] && TEST_DIR=$BASE_DIR/../../../../
+[[ -z "$TEST_DIR" ]] && TEST_DIR=$BASE_DIR/../../../
 
 TEST_DIR="$(mkdir -p $TEST_DIR && cd $TEST_DIR && echo $PWD)"
-SPDK_BUILD_DIR=$BASE_DIR/../../../
+SPDK_BUILD_DIR=$BASE_DIR/../../
 
 SPDK_VHOST_SCSI_TEST_DIR=$TEST_DIR/vhost
 
@@ -72,7 +72,7 @@ mkdir -p $TEST_DIR
 #
 # Source config describing QEMU and VHOST cores and NUMA
 #
-source $(readlink -f $(dirname ${BASH_SOURCE[0]}))/autotest.config
+source $BASE_DIR/common/autotest.config
 
 # Trace flag is optional, if it wasn't set earlier - disable it after sourcing
 # autotest_common.sh
diff --git a/test/vhost/common/run_vhost.sh b/test/vhost/common/run_vhost.sh
index bd6c496a0..2b4940d65 100755
--- a/test/vhost/common/run_vhost.sh
+++ b/test/vhost/common/run_vhost.sh
@@ -45,7 +45,7 @@ fi
 notice "$0"
 notice ""
 
-. $COMMON_DIR/common.sh
+. $COMMON_DIR/../common.sh
 
 # Starting vhost with valid options
 spdk_vhost_run $vhost_num --conf-path=$CONF_DIR
diff --git a/test/vhost/common/vm_run.sh b/test/vhost/common/vm_run.sh
index 03938f8ce..53937871c 100755
--- a/test/vhost/common/vm_run.sh
+++ b/test/vhost/common/vm_run.sh
@@ -33,7 +33,7 @@ while getopts 'xah-:' optchar; do
 	esac
 done
 
-. $COMMON_DIR/common.sh
+. $COMMON_DIR/../common.sh
 
 if [[ $EUID -ne 0 ]]; then
 	fail "Go away user come back as root"
diff --git a/test/vhost/common/vm_setup.sh b/test/vhost/common/vm_setup.sh
index 7e3599fd0..06e4731dc 100755
--- a/test/vhost/common/vm_setup.sh
+++ b/test/vhost/common/vm_setup.sh
@@ -71,7 +71,7 @@ for param in "$@"; do
 	setup_params+=( "$param" )
 done
 
-. $COMMON_DIR/common.sh
+. $COMMON_DIR/../common.sh
 
 vm_setup ${setup_params[@]}
 
diff --git a/test/vhost/common/vm_shutdown.sh b/test/vhost/common/vm_shutdown.sh
index 1de1170f3..f8e76298f 100755
--- a/test/vhost/common/vm_shutdown.sh
+++ b/test/vhost/common/vm_shutdown.sh
@@ -36,7 +36,7 @@ while getopts "$optspec" optchar; do
 	esac
 done
 
-. $COMMON_DIR/common.sh
+. $COMMON_DIR/../common.sh
 
 if $do_kill && [[ $EUID -ne 0 ]]; then
 	echo "Go away user come back as root"
diff --git a/test/vhost/common/vm_ssh.sh b/test/vhost/common/vm_ssh.sh
index abdc33220..fa34d2cd1 100755
--- a/test/vhost/common/vm_ssh.sh
+++ b/test/vhost/common/vm_ssh.sh
@@ -33,7 +33,7 @@ while getopts 'xwh-:' optchar; do
 	esac
 done
 
-. $COMMON_DIR/common.sh
+. $COMMON_DIR/../common.sh
 
 shift $((OPTIND-1))
 vm_num="$1"
diff --git a/test/vhost/fiotest/autotest.sh b/test/vhost/fiotest/autotest.sh
index c19648636..07e0c54e0 100755
--- a/test/vhost/fiotest/autotest.sh
+++ b/test/vhost/fiotest/autotest.sh
@@ -71,7 +71,7 @@ if [[ ! -r "$fio_job" ]]; then
 	fail "no fio job file specified"
 fi
 
-. $COMMON_DIR/common.sh
+. $COMMON_DIR/../common.sh
 
 trap 'error_exit "${FUNCNAME}" "${LINENO}"' ERR
 
diff --git a/test/vhost/hotplug/common.sh b/test/vhost/hotplug/common.sh
index 31debaff3..db5adae23 100644
--- a/test/vhost/hotplug/common.sh
+++ b/test/vhost/hotplug/common.sh
@@ -59,7 +59,7 @@ shift $(( OPTIND - 1 ))
 fio_job=$HOTPLUG_DIR/fio_jobs/default_integrity.job
 tmp_attach_job=$HOTPLUG_DIR/fio_jobs/fio_attach.job.tmp
 tmp_detach_job=$HOTPLUG_DIR/fio_jobs/fio_detach.job.tmp
-. $HOTPLUG_DIR/../common/common.sh
+. $HOTPLUG_DIR/../common.sh
 
 rpc_py="$SPDK_BUILD_DIR/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
 
diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh
index 3d812602a..79e537f67 100755
--- a/test/vhost/initiator/blockdev.sh
+++ b/test/vhost/initiator/blockdev.sh
@@ -39,7 +39,7 @@ while getopts 'h-:' optchar; do
 	esac
 done
 
-source $COMMON_DIR/common.sh
+source $COMMON_DIR/../common.sh
 source $INITIATOR_DIR/autotest.config
 PLUGIN_DIR=$ROOT_DIR/examples/bdev/fio_plugin
 RPC_PY="$ROOT_DIR/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
diff --git a/test/vhost/integrity/integrity_start.sh b/test/vhost/integrity/integrity_start.sh
index cfda9421d..641c4aecc 100755
--- a/test/vhost/integrity/integrity_start.sh
+++ b/test/vhost/integrity/integrity_start.sh
@@ -47,7 +47,7 @@ while getopts 'xh-:' optchar; do
 	esac
 done
 
-. $(readlink -e "$(dirname $0)/../common/common.sh") || exit 1
+. $(readlink -e "$(dirname $0)/../common.sh") || exit 1
 rpc_py="$SPDK_BUILD_DIR/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
 
 trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
diff --git a/test/vhost/lvol/lvol_test.sh b/test/vhost/lvol/lvol_test.sh
index 0b665679b..1b56f2fbc 100755
--- a/test/vhost/lvol/lvol_test.sh
+++ b/test/vhost/lvol/lvol_test.sh
@@ -8,7 +8,7 @@ LVOL_TEST_DIR=$(readlink -f $(dirname $0))
 [[ -z "$TEST_DIR" ]] && TEST_DIR="$(cd $LVOL_TEST_DIR/../../../../ && pwd)"
 [[ -z "$COMMON_DIR" ]] && COMMON_DIR="$(cd $LVOL_TEST_DIR/../common && pwd)"
 
-. $COMMON_DIR/common.sh
+. $COMMON_DIR/../common.sh
 rpc_py="$SPDK_BUILD_DIR/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
 
 vm_count=1
diff --git a/test/vhost/migration/migration.sh b/test/vhost/migration/migration.sh
index bdfcd8453..28e1f721e 100755
--- a/test/vhost/migration/migration.sh
+++ b/test/vhost/migration/migration.sh
@@ -55,7 +55,7 @@ for param in "$@"; do
 	esac
 done
 
-. $(readlink -e "$(dirname $0)/../common/common.sh") || exit 1
+. $(readlink -e "$(dirname $0)/../common.sh") || exit 1
 MIGRATION_DIR=$(readlink -f $(dirname $0))
 
 [[ ! -z "$test_cases" ]] || fail "Need '--test-cases=' parameter"
diff --git a/test/vhost/other/negative.sh b/test/vhost/other/negative.sh
index a34c462d4..17f8e626c 100755
--- a/test/vhost/other/negative.sh
+++ b/test/vhost/other/negative.sh
@@ -34,7 +34,7 @@ while getopts 'xh-:' optchar; do
 done
 
 
-. $COMMON_DIR/common.sh
+. $COMMON_DIR/../common.sh
 
 trap error_exit ERR
 
diff --git a/test/vhost/perf_bench/vhost_perf.sh b/test/vhost/perf_bench/vhost_perf.sh
index f87eb31c1..b951970c7 100755
--- a/test/vhost/perf_bench/vhost_perf.sh
+++ b/test/vhost/perf_bench/vhost_perf.sh
@@ -136,7 +136,7 @@ while getopts 'xh-:' optchar; do
 	esac
 done
 
-. $(readlink -e "$(dirname $0)/../common/common.sh") || exit 1
+. $(readlink -e "$(dirname $0)/../common.sh") || exit 1
 . $(readlink -e "$(dirname $0)/../../../scripts/common.sh") || exit 1
 BASE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 COMMON_DIR="$(cd $(readlink -f $(dirname $0))/../common && pwd)"
diff --git a/test/vhost/readonly/readonly.sh b/test/vhost/readonly/readonly.sh
index 3d7f15efa..44e8eeab0 100755
--- a/test/vhost/readonly/readonly.sh
+++ b/test/vhost/readonly/readonly.sh
@@ -4,7 +4,7 @@ set -e
 READONLY_BASE_DIR=$(readlink -f $(dirname $0))
 [[ -z "$TEST_DIR" ]] && TEST_DIR="$(cd $READONLY_BASE_DIR/../../../../ && pwd)"
 [[ -z "$COMMON_DIR" ]] && COMMON_DIR="$(cd $READONLY_BASE_DIR/../common && pwd)"
-source $COMMON_DIR/common.sh
+source $COMMON_DIR/../common.sh
 
 rpc_py="$READONLY_BASE_DIR/../../../scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
 
diff --git a/test/vhost/shared/shared.sh b/test/vhost/shared/shared.sh
index 939fe1111..31c28850a 100755
--- a/test/vhost/shared/shared.sh
+++ b/test/vhost/shared/shared.sh
@@ -4,7 +4,7 @@ set -e
 SHARED_DIR=$(readlink -f $(dirname $0))
 [[ -z "$COMMON_DIR" ]] && COMMON_DIR="$(cd $SHARED_DIR/../common && pwd)"
 ROOT_DIR=$(readlink -f $SHARED_DIR/../../..)
-source $COMMON_DIR/common.sh
+source $COMMON_DIR/../common.sh
 PLUGIN_DIR=$ROOT_DIR/examples/bdev/fio_plugin
 FIO_PATH="/usr/src/fio"
 rpc_py="$SPDK_BUILD_DIR/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
diff --git a/test/vhost/vhost_boot/vhost_boot.sh b/test/vhost/vhost_boot/vhost_boot.sh
index e95b38392..c8d1d8d77 100755
--- a/test/vhost/vhost_boot/vhost_boot.sh
+++ b/test/vhost/vhost_boot/vhost_boot.sh
@@ -3,7 +3,7 @@ set -xe
 
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
-. $testdir/../common/common.sh
+. $testdir/../common.sh
 . $rootdir/test/bdev/nbd_common.sh
 
 rpc_py="$SPDK_BUILD_DIR/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
diff --git a/test/vhost/windows/windows.sh b/test/vhost/windows/windows.sh
index 92c2a5f32..15a61fb48 100755
--- a/test/vhost/windows/windows.sh
+++ b/test/vhost/windows/windows.sh
@@ -4,7 +4,7 @@ set -e
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $(dirname $0))/../../..
 vhost_common_dir=$(readlink -e "$(dirname $0)/../common")
-source "$vhost_common_dir/common.sh"
+source "$vhost_common_dir/../common.sh"
 
 rpc_py="$rootdir/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
 ctrl_type="spdk_vhost_scsi"