diff --git a/test/verify/check-storage-mounting b/test/verify/check-storage-mounting
index 6e32b221c572..131b4020f198 100755
--- a/test/verify/check-storage-mounting
+++ b/test/verify/check-storage-mounting
@@ -428,6 +428,11 @@ class TestStorageMountingLUKS(storagelib.StorageCase):
 
         self.login_and_go("/storage")
 
+        self.addCleanup(m.execute,
+                        "umount /run/data || true;"
+                        "cryptsetup close $(lsblk -lno NAME /dev/test/one | tail -1) || true;"
+                        "vgremove --force test 2>/dev/null || true")
+
         # Quickly make two logical volumes
         disk = self.add_ram_disk()
         b.wait_in_text("#drives", disk)