diff --git a/qemu/tests/cpuflags.py b/qemu/tests/cpuflags.py
index 1a3c77e1adc1b8d986a8337ac8ddaef0570ab548..0b474c2665eeed6c5e15d6a24cb1bfc2f9c1adb0 100644
--- a/qemu/tests/cpuflags.py
+++ b/qemu/tests/cpuflags.py
@@ -81,11 +81,16 @@ def run_cpuflags(test, params, env):
             vm.create(migration_mode=mig_protocol)
         else:
             vm.create()
-        vm.verify_alive()
 
         session = None
-        if wait:
-            session = vm.wait_for_login()
+        try:
+            vm.verify_alive()
+
+            if wait:
+                session = vm.wait_for_login()
+        except qemu_vm.ImageUnbootableError:
+            vm.destroy(gracefully=False)
+            raise
 
         return (vm, session)