diff --git a/plans/tier0.fmf b/plans/tier0.fmf
index 22cefa2..759dec5 100644
--- a/plans/tier0.fmf
+++ b/plans/tier0.fmf
@@ -7,8 +7,6 @@ summary: Internal Tier0 tests
 environment:
     SOURCE_RELEASE: '9.8'
     TARGET_RELEASE: '10.2'
-    LEAPP_UNSUPPORTED: '1'
-    LEAPP_DEVEL_SKIP_CHECK_OS_RELEASE: '1'
 
 context:
     distro: rhel-9.8
@@ -20,39 +18,36 @@ adjust:
     - environment+:
         INSTALL_LEAPP_FROM_COMPOSE: yes
 
-/customrepos_test_basic_upgrade:
-    plan:
-        import:
-            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
-            name: /plans/newstyle/upgrades/tests/destructive/test_basic.py::TestBasic
-            ref: main
-
-/oamg3661_two_reboots:
-    plan:
-        import:
-            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
-            name: /plans/newstyle/upgrades/tests/destructive/test_subsequent_reboot_after_failed_upgrade.py::TestSubsequentRebootAfterFailedUpgrade
-            ref: main
-
-/oamg9299_devtmpfs_in_fstab:
-    plan:
-        import:
-            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
-            name: /plans/newstyle/upgrades/tests/destructive/test_devtmpfs_in_fstab.py::TestDevtmpfsInFstab
-            ref: main
-
-/rhsm_test_basic_upgrade:
-    plan:
-        import:
-            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
-            name: /plans/newstyle/upgrades/tests/destructive/test_basic.py::TestBasicRhsm
-            ref: main
-
-/tier0only:
-    plan:
-        import:
-            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
-            name: /plans/newstyle/nondestructive/tier0only
-            ref: main
-
+/destructive:
+    /TestBasic:
+        plan:
+            import:
+                url: https://gitlab.cee.redhat.com/oamg/leapp-tests
+                name: /plans/newstyle/upgrades/tests/destructive/test_basic.py::TestBasic
+                ref: main
+    /TestSubsequentRebootAfterFailedUpgrade:
+        plan:
+            import:
+                url: https://gitlab.cee.redhat.com/oamg/leapp-tests
+                name: /plans/newstyle/upgrades/tests/destructive/test_subsequent_reboot_after_failed_upgrade.py::TestSubsequentRebootAfterFailedUpgrade
+                ref: main
+    /TestDevtmpfsInFstab:
+        plan:
+            import:
+                url: https://gitlab.cee.redhat.com/oamg/leapp-tests
+                name: /plans/newstyle/upgrades/tests/destructive/test_devtmpfs_in_fstab.py::TestDevtmpfsInFstab
+                ref: main
+    /TestBasicRhsm:
+        plan:
+            import:
+                url: https://gitlab.cee.redhat.com/oamg/leapp-tests
+                name: /plans/newstyle/upgrades/tests/destructive/test_basic.py::TestBasicRhsm
+                ref: main
 
+/nondestructive:
+    /tier0only:
+        plan:
+            import:
+                url: https://gitlab.cee.redhat.com/oamg/leapp-tests
+                name: /plans/newstyle/nondestructive/tier0only
+                ref: main