diff --git a/ironic/tests/unit/api/test_rbac_legacy.yaml b/ironic/tests/unit/api/test_rbac_legacy.yaml
index ec9e6f2018..2ad1e0e06d 100644
--- a/ironic/tests/unit/api/test_rbac_legacy.yaml
+++ b/ironic/tests/unit/api/test_rbac_legacy.yaml
@@ -530,7 +530,7 @@ nodes_states_console_get_member:
   assert_status: 404
   deprecated: true
 
-nodes_states_console_get_admin:
+nodes_states_console_get_observer:
   path: '/v1/nodes/{node_ident}/states/console'
   method: get
   headers: *observer_headers
@@ -1834,13 +1834,6 @@ drivers_vendor_passthru_delete_observer:
   assert_status: 403
   skip_reason: not updated for scope testing
 
-drivers_vendor_passthru_delete_observer:
-  path: '/v1/drivers/{driver_name}/vendor_passthru?method=test'
-  method: delete
-  headers: *observer_headers
-  assert_status: 403
-  skip_reason: not updated for scope testing
-
 # Node Bios - https://docs.openstack.org/api-ref/baremetal/#node-bios-nodes
 
 nodes_bios_get_admin:
diff --git a/ironic/tests/unit/api/test_rbac_project_scoped.yaml b/ironic/tests/unit/api/test_rbac_project_scoped.yaml
index 83185f0936..9dd9dad1df 100644
--- a/ironic/tests/unit/api/test_rbac_project_scoped.yaml
+++ b/ironic/tests/unit/api/test_rbac_project_scoped.yaml
@@ -1411,7 +1411,7 @@ owner_member_can_set_raid_config:
   body: *raid_body
   assert_status: 503
 
-owner_member_can_set_raid_config:
+service_owner_can_set_raid_config:
   path: '/v1/nodes/{lessee_node_ident}/states/raid'
   method: put
   headers: *service_headers_owner_project
@@ -1850,7 +1850,7 @@ owner_reader_get_traits:
   headers: *owner_reader_headers
   assert_status: 200
 
-owner_reader_get_traits:
+owner_reader_get_traits_service:
   path: '/v1/nodes/{owner_node_ident}/traits'
   method: get
   headers: *service_headers_owner_project
@@ -1927,7 +1927,7 @@ third_party_admin_cannot_put_traits:
   assert_status: 404
   body: *traits_body
 
-third_party_admin_cannot_put_traits:
+third_party_admin_cannot_put_traits_service:
   path: '/v1/nodes/{lessee_node_ident}/traits'
   method: put
   headers: *service_headers
@@ -2910,7 +2910,7 @@ third_party_admin_cannot_get_volume_connector:
   headers: *third_party_admin_headers
   assert_status: 404
 
-lessee_member_cannot_patch_volume_connectors:
+lessee_member_cannot_patch_volume_connectors_extra:
   path: '/v1/volume/connectors/{volume_connector_ident}'
   method: patch
   headers: *lessee_member_headers
@@ -3183,7 +3183,7 @@ owner_manager_can_delete_volume_target:
   headers: *owner_manager_headers
   assert_status: 503
 
-owner_manager_can_delete_volume_target:
+owner_manager_can_delete_volume_target_service:
   path: '/v1/volume/targets/{volume_target_ident}'
   method: delete
   headers: *service_headers_owner_project
@@ -3821,7 +3821,7 @@ third_party_admin_cannot_get_node_history:
   headers: *third_party_admin_headers
   assert_status: 404
 
-node_history_get_entry_admin:
+node_history_get_entry_third_party_admin:
   path: '/v1/nodes/{owner_node_ident}/history/{owned_history_ident}'
   method: get
   headers: *third_party_admin_headers
@@ -4029,7 +4029,7 @@ runbooks_post_public_admin:
   headers: *owner_admin_headers
   assert_status: 400
 
-runbooks_post_public_admin:
+runbooks_post_public_manager:
   path: '/v1/runbooks'
   method: post
   body: *runbook_body_public
@@ -4085,13 +4085,6 @@ service_get_runbooks:
   headers: *service_headers_owner_project
   assert_status: 200
 
-service_patch_runbook:
-  path: '/v1/runbooks/{runbook_ident}'
-  method: patch
-  body: *runbook_patch
-  headers: *service_headers_owner_project
-  assert_status: 200
-
 runbooks_project_admin:
   path: '/v1/runbooks'
   method: get
diff --git a/ironic/tests/unit/api/test_rbac_system_scoped.yaml b/ironic/tests/unit/api/test_rbac_system_scoped.yaml
index c8224c94e9..b01759d601 100644
--- a/ironic/tests/unit/api/test_rbac_system_scoped.yaml
+++ b/ironic/tests/unit/api/test_rbac_system_scoped.yaml
@@ -1091,7 +1091,7 @@ nodes_portgroups_get_service_project:
   assert_status: 200
   enable_service_project: true
 
-nodes_portgroups_get_service_project:
+nodes_portgroups_get_service_project_disabled:
   path: '/v1/nodes/{node_ident}/portgroups'
   method: get
   headers: *service_project_headers
@@ -1129,7 +1129,7 @@ nodes_portgroups_detail_get_service_project:
   assert_status: 200
   enable_service_project: true
 
-nodes_portgroups_detail_get_service_project:
+nodes_portgroups_detail_get_service_project_disabled:
   path: '/v1/nodes/{node_ident}/portgroups/detail'
   method: get
   headers: *service_project_headers
@@ -1697,7 +1697,7 @@ volume_volume_target_id_get_service:
 
 # NOTE(TheJulia): This triggers a call to the conductor and
 # thus will fail, but does not return a 403 which means success.
-volume_volume_target_id_patch_admin:
+volume_volume_target_id_patch_admin_extra:
   path: '/v1/volume/targets/{volume_target_ident}'
   method: patch
   body: &volume_target_patch
@@ -1721,7 +1721,7 @@ volume_volume_target_id_patch_reader:
   headers: *reader_headers
   assert_status: 403
 
-volume_volume_target_id_patch_service:
+volume_volume_target_id_patch_service_disabled:
   path: '/v1/volume/targets/{volume_target_ident}'
   method: patch
   body: *volume_target_patch
@@ -1973,7 +1973,7 @@ drivers_vendor_passthru_delete_admin:
   headers: *admin_headers
   assert_status: 404
 
-drivers_vendor_passthru_delete_reader:
+drivers_vendor_passthru_delete_member:
   path: '/v1/drivers/{driver_name}/vendor_passthru?method=test'
   method: delete
   headers: *scoped_member_headers
@@ -2752,13 +2752,6 @@ runbooks_post_project_admin:
   headers: *project_admin_headers
   assert_status: 201
 
-runbooks_runbook_id_patch_public_admin:
-  path: '/v1/runbooks/{runbook_ident}'
-  method: patch
-  body: *runbook_public_patch
-  headers: *admin_headers
-  assert_status: 200
-
 public_runbooks_post_admin:
   path: '/v1/runbooks'
   method: post