diff --git a/autotest.sh b/autotest.sh
index 568a475a7..4478d8f69 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -177,10 +177,9 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then
 		# Only test hotplug without ASAN enabled. Since if it is
 		# enabled, it catches SEGV earlier than our handler which
 		# breaks the hotplug logic.
-		# Temporary workaround for issue #542, annotated for no VM image.
-		#if [ $SPDK_RUN_ASAN -eq 0 ]; then
-		#	run_test suite test/nvme/hotplug.sh intel
-		#fi
+		if [ $SPDK_RUN_ASAN -eq 0 ]; then
+			run_test suite test/nvme/hotplug.sh intel
+		fi
 	fi
 
 	if [ $SPDK_TEST_IOAT -eq 1 ]; then
diff --git a/test/nvme/hotplug.sh b/test/nvme/hotplug.sh
index ebb51a118..9884d961d 100755
--- a/test/nvme/hotplug.sh
+++ b/test/nvme/hotplug.sh
@@ -78,8 +78,8 @@ function devices_delete() {
 }
 
 password=$1
-base_img=${DEPENDENCY_DIR}/fedora24.img
-test_img=${DEPENDENCY_DIR}/fedora24_test.img
+base_img=${DEPENDENCY_DIR}/fedora-hotplug.qcow2
+test_img=${DEPENDENCY_DIR}/fedora-hotplug-test.qcow2
 qemu_pidfile=${DEPENDENCY_DIR}/qemupid
 
 if [ ! -e "$base_img" ]; then