diff --git a/tests/subsys/suit/orchestrator/orchestrator_sdfw/src/test_init.c b/tests/subsys/suit/orchestrator/orchestrator_sdfw/src/test_init.c
index 2a26ee2140b1..575d5ede5ee2 100644
--- a/tests/subsys/suit/orchestrator/orchestrator_sdfw/src/test_init.c
+++ b/tests/subsys/suit/orchestrator/orchestrator_sdfw/src/test_init.c
@@ -80,7 +80,7 @@ static void setup_boot_report(uint8_t *buf, size_t len)
 
 ZTEST_SUITE(orchestrator_init_tests, NULL, NULL, NULL, NULL, NULL);
 
-ZTEST(orchestrator_init_tests, test_empty_storage)
+ZTEST(orchestrator_init_tests, test_orchestrator_sdfw_empty_storage)
 {
 	/* GIVEN empty flash (suit storage is erased)... */
 	setup_erased_flash();
@@ -105,7 +105,7 @@ ZTEST(orchestrator_init_tests, test_empty_storage)
 	check_startup_failure();
 }
 
-ZTEST(orchestrator_init_tests, test_empty_storage_with_update_flag)
+ZTEST(orchestrator_init_tests, test_orchestrator_sdfw_empty_storage_with_update_flag)
 {
 	/* GIVEN empty flash (suit storage is erased)... */
 	setup_erased_flash();
@@ -131,7 +131,7 @@ ZTEST(orchestrator_init_tests, test_empty_storage_with_update_flag)
 	check_startup_failure();
 }
 
-ZTEST(orchestrator_init_tests, test_empty_storage_with_recovery_flag)
+ZTEST(orchestrator_init_tests, test_orchestrator_sdfw_empty_storage_with_recovery_flag)
 {
 	/* GIVEN empty flash (suit storage is erased)... */
 	setup_erased_flash();
@@ -157,7 +157,7 @@ ZTEST(orchestrator_init_tests, test_empty_storage_with_recovery_flag)
 	check_startup_failure();
 }
 
-ZTEST(orchestrator_init_tests, test_empty_storage_with_update_recovery_flag)
+ZTEST(orchestrator_init_tests, test_orchestrator_sdfw_empty_storage_with_update_recovery_flag)
 {
 	/* GIVEN empty flash (suit storage is erased)... */
 	setup_erased_flash();
diff --git a/tests/subsys/suit/storage_nrf54h20/src/test_storage_init.c b/tests/subsys/suit/storage_nrf54h20/src/test_storage_init.c
index 8a6687660e0e..56093d7b1254 100644
--- a/tests/subsys/suit/storage_nrf54h20/src/test_storage_init.c
+++ b/tests/subsys/suit/storage_nrf54h20/src/test_storage_init.c
@@ -12,7 +12,7 @@
 
 ZTEST_SUITE(suit_storage_nrf54h20_init_tests, NULL, NULL, NULL, NULL, NULL);
 
-ZTEST(suit_storage_nrf54h20_init_tests, test_empty_storage)
+ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_empty_storage)
 {
 	/* GIVEN the whole SUIT storage area is erased (unprovisioned device) */
 	erase_area_nordic();
@@ -36,7 +36,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_empty_storage)
 	assert_nordic_classes();
 }
 
-ZTEST(suit_storage_nrf54h20_init_tests, test_empty_app_rad_with_digest)
+ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_empty_app_rad_with_digest)
 {
 	/* GIVEN the device is provisioned with empty application and radio MPI */
 	erase_area_nordic();
@@ -75,7 +75,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_empty_app_rad_with_digest)
 	assert_nordic_classes();
 }
 
-ZTEST(suit_storage_nrf54h20_init_tests, test_with_root_rad)
+ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_with_root_rad)
 {
 	/* GIVEN the device is provisioned with application MPI with root config and sample radio
 	 * MPI entry
@@ -118,7 +118,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_with_root_rad)
 	assert_sample_root_rad_class();
 }
 
-ZTEST(suit_storage_nrf54h20_init_tests, test_with_root_rad_backup)
+ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_with_root_rad_backup)
 {
 	/* GIVEN the device was provisioned with application and radio MPI with root and sample
 	 * radio config
@@ -162,7 +162,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_with_root_rad_backup)
 	assert_sample_root_rad_class();
 }
 
-ZTEST(suit_storage_nrf54h20_init_tests, test_with_old_root_rad_backup)
+ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_with_old_root_rad_backup)
 {
 	/* GIVEN the device was provisioned with application MPI with old root and sample radio
 	 * config
@@ -212,7 +212,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_with_old_root_rad_backup)
 	assert_sample_root_rad_class();
 }
 
-ZTEST(suit_storage_nrf54h20_init_tests, test_app_with_old_root_new_rad_nvv_backup)
+ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_app_with_old_root_new_rad_nvv_backup)
 {
 	/* GIVEN the device was provisioned with application MPI with old root and sample radio
 	 * config
@@ -261,7 +261,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_app_with_old_root_new_rad_nvv_backu
 	assert_sample_root_rad_class();
 }
 
-ZTEST(suit_storage_nrf54h20_init_tests, test_app_corrupted_nvv)
+ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_app_corrupted_nvv)
 {
 	/* GIVEN the device is provisioned with application MPI with root config */
 	erase_area_nordic();
@@ -299,7 +299,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_app_corrupted_nvv)
 	assert_sample_root_class();
 }
 
-ZTEST(suit_storage_nrf54h20_init_tests, test_app_corrupted_nvv_backup)
+ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_app_corrupted_nvv_backup)
 {
 	/* GIVEN the device is provisioned with application MPI with root config */
 	erase_area_nordic();
diff --git a/tests/subsys/suit/storage_nrf54h20/src/test_storage_purge.c b/tests/subsys/suit/storage_nrf54h20/src/test_storage_purge.c
index bfec9087149b..86ad18380058 100644
--- a/tests/subsys/suit/storage_nrf54h20/src/test_storage_purge.c
+++ b/tests/subsys/suit/storage_nrf54h20/src/test_storage_purge.c
@@ -44,7 +44,7 @@ static void assert_rad_purged(void)
 				   SUIT_STORAGE_RAD_MPI_SIZE + SUIT_STORAGE_DIGEST_SIZE);
 }
 
-ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_populated_storage)
+ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_storage_purge_populated_storage)
 {
 	suit_plat_mreg_t update_candidate[1] = {{
 		.mem = (uint8_t *)0xCAFEFECA,
@@ -103,7 +103,7 @@ ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_populated_storage)
 	assert_only_nordic_classes();
 }
 
-ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_populated_storage_rad_first)
+ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_storage_purge_populated_storage_rad_first)
 {
 	suit_plat_mreg_t update_candidate[1] = {{
 		.mem = (uint8_t *)0xCAFEFECA,
@@ -201,7 +201,7 @@ ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_populated_storage_rad_firs
 	assert_only_nordic_classes();
 }
 
-ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_empty_storage)
+ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_storage_purge_empty_storage)
 {
 	/* GIVEN storage area is not initialized */
 	erase_area_nordic();
@@ -234,7 +234,7 @@ ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_empty_storage)
 	assert_only_nordic_classes();
 }
 
-ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_update_only)
+ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_storage_purge_update_only)
 {
 	suit_plat_mreg_t update_candidate[1] = {{
 		.mem = (uint8_t *)0xCAFEFECA,