diff --git a/autotest.sh b/autotest.sh
index c5fe18b9c..e7d54d0fa 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -208,7 +208,7 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then
 		# enabled, it catches SEGV earlier than our handler which
 		# breaks the hotplug logic.
 		if [ $SPDK_RUN_ASAN -eq 0 ]; then
-			run_test "nvme_hotplug" test/nvme/hotplug.sh intel
+			run_test "nvme_hotplug" test/nvme/hotplug.sh root
 		fi
 	fi
 
diff --git a/scripts/perf/vhost/run_vhost_test.py b/scripts/perf/vhost/run_vhost_test.py
index e6d86161f..8ee235504 100644
--- a/scripts/perf/vhost/run_vhost_test.py
+++ b/scripts/perf/vhost/run_vhost_test.py
@@ -152,7 +152,7 @@ parser.add_argument('-d', '--max-disks', default=0, type=int,
                     each virtual machine gets it's own bdev to work on.")
 parser.add_argument('-v', '--vm-count', default=1, type=int,
                     help="How many VMs to run in test. Default: 1")
-parser.add_argument('-i', '--vm-image', default="$HOME/vhost_vm_image.qcow2",
+parser.add_argument('-i', '--vm-image', default="$HOME/spdk_test_image.qcow2",
                     type=str, help="VM image to use for running VMs.")
 
 subparsers = parser.add_subparsers()
diff --git a/test/nvme/hotplug.sh b/test/nvme/hotplug.sh
index 13011e193..f032b54e4 100755
--- a/test/nvme/hotplug.sh
+++ b/test/nvme/hotplug.sh
@@ -54,9 +54,8 @@ function devices_delete() {
 }
 
 password=$1
-base_img=${DEPENDENCY_DIR}/fedora-hotplug.qcow2
-test_img=${DEPENDENCY_DIR}/fedora-hotplug-test.qcow2
-qemu_pidfile=${DEPENDENCY_DIR}/qemupid
+base_img=$HOME/spdk_test_image.qcow2
+qemu_pidfile=$HOME/qemupid
 
 if [ ! -e "$base_img" ]; then
 	echo "Hotplug VM image not found; skipping test"
@@ -65,8 +64,6 @@ fi
 
 timing_enter start_qemu
 
-qemu-img create -b "$base_img" -f qcow2 "$test_img"
-
 for i in {0..3}; do
 	dd if=/dev/zero of="$SPDK_TEST_STORAGE/nvme$i.img" bs=1M count=1024
 done
@@ -74,7 +71,7 @@ done
 qemu-system-x86_64 \
 	-daemonize -display none -m 8192 \
 	-pidfile "$qemu_pidfile" \
-	-hda "$test_img" \
+	-hda "$base_img" \
 	-net user,hostfwd=tcp::10022-:22 \
 	-net nic \
 	-cpu host \
@@ -85,7 +82,8 @@ qemu-system-x86_64 \
 	-drive format=raw,file="$SPDK_TEST_STORAGE/nvme0.img",if=none,id=drive0 \
 	-drive format=raw,file="$SPDK_TEST_STORAGE/nvme1.img",if=none,id=drive1 \
 	-drive format=raw,file="$SPDK_TEST_STORAGE/nvme2.img",if=none,id=drive2 \
-	-drive format=raw,file="$SPDK_TEST_STORAGE/nvme3.img",if=none,id=drive3
+	-drive format=raw,file="$SPDK_TEST_STORAGE/nvme3.img",if=none,id=drive3 \
+	-snapshot
 
 timing_exit start_qemu
 
@@ -129,6 +127,5 @@ trap - SIGINT SIGTERM EXIT
 qemupid=$(awk '{printf $0}' "$qemu_pidfile")
 kill -9 $qemupid
 rm "$qemu_pidfile"
-rm "$test_img"
 
 timing_exit hotplug_test
diff --git a/test/vhost/common.sh b/test/vhost/common.sh
index fbe37c5b6..18442283d 100644
--- a/test/vhost/common.sh
+++ b/test/vhost/common.sh
@@ -8,8 +8,7 @@ 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
+VM_IMAGE=$HOME/spdk_test_image.qcow2
 
 if ! hash $QEMU_IMG_BIN $QEMU_BIN; then
 	error 'QEMU is not installed on this system. Unable to run vhost tests.'
diff --git a/test/vhost/manual.sh b/test/vhost/manual.sh
index 187a0225e..87ea969c1 100755
--- a/test/vhost/manual.sh
+++ b/test/vhost/manual.sh
@@ -21,7 +21,7 @@ case $1 in
 		echo "  -h |--help                           prints this message"
 		echo ""
 		echo "Environment:"
-		echo "  VM_IMAGE        path to QCOW2 VM image used during test (default: $HOME/vhost_vm_image.qcow2)"
+		echo "  VM_IMAGE        path to QCOW2 VM image used during test (default: $HOME/spdk_test_image.qcow2)"
 		echo ""
 		echo "Tests are performed only on Linux machine. For other OS no action is performed."
 		echo ""
diff --git a/test/vhost/perf_bench/vhost_perf.sh b/test/vhost/perf_bench/vhost_perf.sh
index abbbc2848..83edfab87 100755
--- a/test/vhost/perf_bench/vhost_perf.sh
+++ b/test/vhost/perf_bench/vhost_perf.sh
@@ -53,7 +53,7 @@ function usage() {
 	echo "    --vm-memory=INT         Amount of RAM memory (in MB) to pass to a single VM."
 	echo "                            Default: 2048 MB"
 	echo "    --vm-image=PATH         OS image to use for running the VMs."
-	echo "                            Default: \$HOME/vhost_vm_image.qcow2"
+	echo "                            Default: \$HOME/spdk_test_image.qcow2"
 	echo "    --vm-sar-enable         Measure CPU utilization in guest VMs using sar."
 	echo "    --host-sar-enable       Measure CPU utilization on host using sar."
 	echo "    --sar-delay=INT         Wait for X seconds before starting SAR measurement. Default: 0."