diff --git a/bin/skiplists/mcp_pike_lvm_skip.list b/bin/skiplists/mcp_pike_lvm_skip.list
deleted file mode 100644
index 372162a..0000000
--- a/bin/skiplists/mcp_pike_lvm_skip.list
+++ /dev/null
@@ -1,14 +0,0 @@
-manila_tempest_tests.tests.api.admin.test_share_types_negative.ShareTypesAdminNegativeTest
-manila_tempest_tests.tests.api.admin.test_multi_backend.ShareMultiBackendTest
-manila_tempest_tests.tests.api.test_share_groups_negative.ShareGroupsNegativeTest
-manila_tempest_tests.tests.api.test_share_groups.ShareGroupsTest.test_create_delete_empty_share_group_snapshot_min
-manila_tempest_tests.tests.api.test_share_groups.ShareGroupsTest.test_create_populate_delete_share_group_min
-manila_tempest_tests.tests.api.test_share_groups.ShareGroupsTest.test_create_sg_and_share_specifying_az_1_sg
-manila_tempest_tests.tests.api.test_share_groups.ShareGroupsTest.test_create_sg_and_share_specifying_az_2_sg_and_share
-manila_tempest_tests.tests.api.test_share_groups.ShareGroupsTest.test_create_sg_and_share_specifying_az_3_none
-manila_tempest_tests.tests.api.test_share_groups.ShareGroupsTest.test_create_share_group_from_empty_share_group_snapshot_min
-manila_tempest_tests.tests.api.admin.test_share_groups.ShareGroupsTest.test_default_share_group_type_applied
-manila_tempest_tests.tests.api.test_share_group_actions.ShareGroupRenameTest
-manila_tempest_tests.tests.api.test_share_group_actions.ShareGroupActionsTest
-manila_tempest_tests.tests.api.admin.test_quotas_negative.SharesAdminQuotasNegativeTest.test_create_share_group_with_exceeding_quota_limit
-manila_tempest_tests.tests.api.admin.test_quotas.SharesAdminQuotasUpdateTest.test_share_group_quotas_usages
diff --git a/bin/skiplists/ceph_rgw.list b/bin/skiplists/skip.list
similarity index 64%
rename from bin/skiplists/ceph_rgw.list
rename to bin/skiplists/skip.list
index b79030b..df32a67 100644
--- a/bin/skiplists/ceph_rgw.list
+++ b/bin/skiplists/skip.list
@@ -22,5 +22,16 @@
 tempest.api.object_storage.test_healthcheck.HealthcheckTest.test_get_healthcheck
 tempest.api.object_storage.test_object_version.ContainerTest.test_versioned_container
 manila_tempest_tests.tests.api.admin.test_share_types_negative.ShareTypesAdminNegativeTest.test_create_share_type_with_description_in_wrong_version
-telemetry_tempest_plugin.aodh.api.test_alarming_api_negative.TelemetryAlarmingNegativeTest.test_get_non_existent_alarm
-telemetry_tempest_plugin.aodh.api.test_alarming_api_negative.TelemetryAlarmingNegativeTest.test_get_update_show_history_delete_deleted_alarm
+manila_tempest_tests.tests.api.admin.test_multi_backend.ShareMultiBackendTest
+manila_tempest_tests.tests.api.test_share_groups_negative.ShareGroupsNegativeTest
+manila_tempest_tests.tests.api.test_share_groups.ShareGroupsTest.test_create_delete_empty_share_group_snapshot_min
+manila_tempest_tests.tests.api.test_share_groups.ShareGroupsTest.test_create_populate_delete_share_group_min
+manila_tempest_tests.tests.api.test_share_groups.ShareGroupsTest.test_create_sg_and_share_specifying_az_1_sg
+manila_tempest_tests.tests.api.test_share_groups.ShareGroupsTest.test_create_sg_and_share_specifying_az_2_sg_and_share
+manila_tempest_tests.tests.api.test_share_groups.ShareGroupsTest.test_create_sg_and_share_specifying_az_3_none
+manila_tempest_tests.tests.api.test_share_groups.ShareGroupsTest.test_create_share_group_from_empty_share_group_snapshot_min
+manila_tempest_tests.tests.api.admin.test_share_groups.ShareGroupsTest.test_default_share_group_type_applied
+manila_tempest_tests.tests.api.test_share_group_actions.ShareGroupRenameTest
+manila_tempest_tests.tests.api.test_share_group_actions.ShareGroupActionsTest
+manila_tempest_tests.tests.api.admin.test_quotas_negative.SharesAdminQuotasNegativeTest.test_create_share_group_with_exceeding_quota_limit
+manila_tempest_tests.tests.api.admin.test_quotas.SharesAdminQuotasUpdateTest.test_share_group_quotas_usages