diff --git a/test/vhost/common.sh b/test/vhost/common.sh
index ea2416e36..c7001c8c2 100644
--- a/test/vhost/common.sh
+++ b/test/vhost/common.sh
@@ -4,6 +4,7 @@
 TEST_DIR=$(readlink -f $rootdir/..)
 VM_DIR=$VHOST_DIR/vms
 TARGET_DIR=$VHOST_DIR/vhost
+VM_PASSWORD="root"
 
 #TODO: Move vhost_vm_image.qcow2 into VHOST_DIR on test systems.
 VM_IMAGE=$HOME/vhost_vm_image.qcow2
@@ -308,7 +309,7 @@ function vm_exec()
 	local vm_num="$1"
 	shift
 
-	sshpass -p root ssh \
+	sshpass -p "$VM_PASSWORD" ssh \
 		-o UserKnownHostsFile=/dev/null \
 		-o StrictHostKeyChecking=no \
 		-o User=root \
@@ -326,7 +327,7 @@ function vm_scp()
 	local vm_num="$1"
 	shift
 
-	sshpass -p root scp \
+	sshpass -p "$VM_PASSWORD" scp \
 		-o UserKnownHostsFile=/dev/null \
 		-o StrictHostKeyChecking=no \
 		-o User=root \
diff --git a/test/vhost/windows/windows_scsi_compliance.sh b/test/vhost/windows/windows_scsi_compliance.sh
index e8a83ada9..0590ca29f 100755
--- a/test/vhost/windows/windows_scsi_compliance.sh
+++ b/test/vhost/windows/windows_scsi_compliance.sh
@@ -45,6 +45,7 @@ done
 
 trap 'rm -f $aio_file; rm -rf $testdir/results; error_exit' SIGINT SIGTERM ERR
 
+VM_PASSWORD="$ssh_pass"
 mkdir -p $testdir/results
 dd if=/dev/zero of=$aio_file bs=1M count=512