diff --git a/ops-sunbeam/ops_sunbeam/test_utils.py b/ops-sunbeam/ops_sunbeam/test_utils.py
index 10d8cb37..5a2301f4 100644
--- a/ops-sunbeam/ops_sunbeam/test_utils.py
+++ b/ops-sunbeam/ops_sunbeam/test_utils.py
@@ -360,7 +360,7 @@ def add_identity_service_relation_response(
     """Add id service data to identity-service relation."""
     credentials_content = {"username": "svcuser1", "password": "svcpass1"}
     credentials_id = harness.add_model_secret("keystone", credentials_content)
-    harness.grant_secret(credentials_id, "my-service")
+    harness.grant_secret(credentials_id, harness.charm.app.name)
     harness.update_relation_data(
         rel_id,
         "keystone",
@@ -378,12 +378,10 @@ def add_identity_service_relation_response(
             "service-domain": "servicedom",
             "service-domain_id": "svcdomid1",
             "service-host": "keystone.service",
-            # "service-password": "svcpass1",
             "service-port": "5000",
             "service-protocol": "http",
             "service-project": "svcproj1",
             "service-project-id": "svcprojid1",
-            # "service-user-name": "svcuser1",
             "service-credentials": credentials_id,
         },
     )