diff --git a/plans/tier0.fmf b/plans/tier0.fmf
index ad99613..fc394ad 100644
--- a/plans/tier0.fmf
+++ b/plans/tier0.fmf
@@ -16,51 +16,39 @@ adjust:
     enabled: false
     when: distro == centos-stream-8
 
-/customrepos_upgrade_happy_path:
+/customrepos_test_basic_upgrade:
     plan:
         import:
             url: https://gitlab.cee.redhat.com/oamg/leapp-tests
-            name: /plans/destructive/customrepos/basic_upgrade/upgrade_happy_path
+            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/destructive/customrepos/oamg/oamg3661_two_reboots
+            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/destructive/customrepos/oamg/oamg9299_devtmpfs_in_fstab
+            name: /plans/newstyle/upgrades/tests/destructive/test_devtmpfs_in_fstab.py::TestDevtmpfsInFstab
             ref: main
 
-/rhsm_upgrade_happy_path:
+/rhsm_test_basic_upgrade:
     plan:
         import:
             url: https://gitlab.cee.redhat.com/oamg/leapp-tests
-            name: /plans/destructive/rhsm/upgrade_happy_path
+            name: /plans/newstyle/upgrades/tests/destructive/test_basic.py::TestBasicRhsm
             ref: main
 
-/customrepos_tier0only:
+/tier0only:
     plan:
         import:
             url: https://gitlab.cee.redhat.com/oamg/leapp-tests
-            name: /plans/nondestructive/customrepos/tier0only
+            name: /plans/newstyle/nondestructive/tier0only
             ref: main
 
-/none_tier0only:
-    plan:
-        import:
-            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
-            name: /plans/nondestructive/none/tier0only
-            ref: main
 
-/rhsm_tier0only:
-    plan:
-        import:
-            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
-            name: /plans/nondestructive/rhsm/tier0only
-            ref: main