diff --git a/test/iso/Makefile b/test/iso/Makefile
index 7ded145..3765ee0 100644
--- a/test/iso/Makefile
+++ b/test/iso/Makefile
@@ -16,9 +16,10 @@ mnt/iso:
 	$(if $(_RHEL),sudo mount mnt/live/LiveOS/rootfs.img mnt/install)
 
 clean:
-	sudo umount mnt/install || true
-	sudo umount mnt/iso || true
-	sudo rmdir mnt/install mnt/iso
+	sudo umount mnt/install
+	$(if $(wildcard mnt/live),sudo umount mnt/live)
+	sudo umount mnt/iso
+	sudo rmdir mnt/install mnt/iso $(wildcard mnt/live)
 
 install-deps:
 	$(install_pkg) isomd5sum coreutils squashfs-tools curl
diff --git a/test/vm/Makefile b/test/vm/Makefile
index 99288cb..5967406 100644
--- a/test/vm/Makefile
+++ b/test/vm/Makefile
@@ -36,6 +36,7 @@ files/grub.cfg: files/mnt/iso
 	sed -i 's/quiet/console=ttyS0,115200n8 inst.ks=cdrom:\/ks.cfg/' files/grub.cfg
 	sed -i 's/set default="1"/set default="0"/'                     files/grub.cfg
 	sed -i 's/set timeout=60/set timeout=1/'                        files/grub.cfg
+	cat files/grub.cfg
 
 .PHONY: clean
 clean: