diff --git a/qemu/tests/cpuflags.py b/qemu/tests/cpuflags.py
index 4a8c2286caf6ffbe6b65d1c051b37814901a9743..6af0b461e61251a2b63f3872f3efecd6e19714d5 100644
--- a/qemu/tests/cpuflags.py
+++ b/qemu/tests/cpuflags.py
@@ -856,15 +856,10 @@ def run(test, params, env):
                 self.vm.monitor.migrate_set_downtime(1)
                 self.vm.wait_for_migration(mig_timeout)
 
-            # Swap due to test cleaning.
-            temp = self.vm.clone(copy_state=True)
-            self.vm.__dict__ = self.clone.__dict__
-            self.clone = temp
-
-            self.vm.resume()
-            self.clone.destroy(gracefully=False)
+            self.clone.resume()
+            self.vm.destroy(gracefully=False)
 
-            stress_session = self.vm.wait_for_login()
+            stress_session = self.clone.wait_for_login()
 
             # If cpuflags-test hang up during migration test raise exception
             try: