diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index a0e312849..e0a8ab90e 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -188,7 +188,7 @@ export LSAN_OPTIONS=suppressions="$asan_suppression_file"
 export DEFAULT_RPC_ADDR="/var/tmp/spdk.sock"
 
 if [ -z "$DEPENDENCY_DIR" ]; then
-	export DEPENDENCY_DIR=/home/sys_sgsw
+	export DEPENDENCY_DIR=/home/sys_sgci/spdk_dependencies
 else
 	export DEPENDENCY_DIR
 fi
diff --git a/test/common/config/README.md b/test/common/config/README.md
index a5966bd90..eb18b10f8 100644
--- a/test/common/config/README.md
+++ b/test/common/config/README.md
@@ -17,7 +17,7 @@ to emulate an RDMA enabled NIC. NVMe controllers can also be virtualized in emul
 
 ## VM Specs
 
-When creating the user during the fedora installation, it is best to use the name sys_sgsw. Efforts are being made
+When creating the user during the fedora installation, it is best to use the name sys_sgci. Efforts are being made
 to remove all references to this user, or files specific to this user from the codebase, but there are still some
 trailing references to it.
 
@@ -33,7 +33,7 @@ configuration file. For a full list of the variable declarations available for a
 
 1. Download a fresh Fedora 26 image.
 2. Perform the installation of Fedora 26 server.
-3. Create an admin user sys_sgsw (enabling passwordless sudo for this account will make life easier during the tests).
+3. Create an admin user sys_sgci (enabling passwordless sudo for this account will make life easier during the tests).
 4. Run the vm_setup.sh script which will install all proper dependencies.
 5. Modify the autorun-spdk.conf file in the home directory.
 6. Reboot the VM.
diff --git a/test/vhost/manual.sh b/test/vhost/manual.sh
index 54c3d981c..881ba5666 100755
--- a/test/vhost/manual.sh
+++ b/test/vhost/manual.sh
@@ -5,7 +5,7 @@ rootdir=$(readlink -f $testdir/../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/vhost/common.sh
 
-DEFAULT_FIO_BIN="/home/sys_sgsw/fio_ubuntu"
+DEFAULT_FIO_BIN="$DEPENDENCY_DIR/fio"
 
 case $1 in
 	-h | --help)
diff --git a/test/vhost/vhost.sh b/test/vhost/vhost.sh
index 3693ba323..616d3224a 100755
--- a/test/vhost/vhost.sh
+++ b/test/vhost/vhost.sh
@@ -12,7 +12,7 @@ if [[ $(uname -s) != Linux ]]; then
 	exit 0
 fi
 
-DEFAULT_FIO_BIN="/home/sys_sgsw/fio_ubuntu"
+DEFAULT_FIO_BIN="$DEPENDENCY_DIR/fio"
 
 : ${FIO_BIN="$DEFAULT_FIO_BIN"}
 vhosttestinit
diff --git a/test/vhost/windows/windows_scsi_compliance.sh b/test/vhost/windows/windows_scsi_compliance.sh
index 450df73da..a7933330f 100755
--- a/test/vhost/windows/windows_scsi_compliance.sh
+++ b/test/vhost/windows/windows_scsi_compliance.sh
@@ -9,7 +9,7 @@ source $rootdir/test/vhost/common.sh
 # and OS Version: 6.3.9600 N/A Build 9600
 # In order to run this test with windows vm
 # windows virtio scsi driver must be installed
-WINDOWS_IMG="/home/sys_sgsw/windows_scsi_compliance/windows_vm_image.qcow2"
+WINDOWS_IMG="$DEPENDENCY_DIR/windows_scsi_compliance/windows_vm_image.qcow2"
 aio_file="$SPDK_TEST_STORAGE/aio_disk"
 ssh_pass=""
 vm_num=1