diff --git a/test/check-application b/test/check-application
index 7e0ca0eee..18eb9f0f0 100755
--- a/test/check-application
+++ b/test/check-application
@@ -93,8 +93,7 @@ class TestApplication(testlib.MachineCase):
         self.admin_s.execute("systemctl --user stop podman.service; systemctl --now --user enable podman.socket")
         self.restore_dir("/home/admin/.local/share/containers", reboot_safe=True)
         self.addCleanup(self.admin_s.execute, "systemctl --user stop podman.service podman.socket || true")
-        self.addCleanup(self.admin_s.execute, "podman rm --force --all || true")
-        self.addCleanup(self.admin_s.execute, "podman pod rm --force --all || true")
+        self.addCleanup(self.admin_s.execute, "podman system reset --force")
 
         # But disable it globally so that "systemctl --user disable" does what we expect
         m.execute("systemctl --global disable podman.socket")