diff --git a/plans/cockpit.fmf b/plans/cockpit.fmf
index d08f48f546..d51e2874a0 100644
--- a/plans/cockpit.fmf
+++ b/plans/cockpit.fmf
@@ -14,17 +14,17 @@ discover:
 execute:
     how: tmt
 
-/basic:
-    summary: Run tests for basic packages
+/main:
+    summary: Non-storage tests
     discover+:
-        test: /test/browser/basic
+        test: /test/browser/main
 
-/network:
-    summary: Run tests for cockpit-networkmanager
+/storage-basic:
+    summary: Basic storage tests
     discover+:
-        test: /test/browser/network
+        test: /test/browser/storage-basic
 
-/optional:
-    summary: Run tests for optional packages
+/storage-extra:
+    summary: More expensive storage tests (LVM, LUKS, Anaconda)
     discover+:
-        test: /test/browser/optional
+        test: /test/browser/storage-extra