diff --git a/ingestion/src/metadata/ingestion/source/database/dbt/metadata.py b/ingestion/src/metadata/ingestion/source/database/dbt/metadata.py
index 276b2a4c581..89eaa22ba9a 100644
--- a/ingestion/src/metadata/ingestion/source/database/dbt/metadata.py
+++ b/ingestion/src/metadata/ingestion/source/database/dbt/metadata.py
@@ -53,6 +53,7 @@ from metadata.generated.schema.tests.testDefinition import (
     TestPlatform,
 )
 from metadata.generated.schema.tests.testSuite import TestSuite
+from metadata.generated.schema.type.basic import FullyQualifiedEntityName
 from metadata.generated.schema.type.entityLineage import EntitiesEdge
 from metadata.generated.schema.type.entityReference import EntityReference
 from metadata.generated.schema.type.tagLabel import (
@@ -781,20 +782,11 @@ class DbtSource(DbtServiceSource):  # pylint: disable=too-many-public-methods
                     yield CreateTestCaseRequest(
                         name=manifest_node.name,
                         description=manifest_node.description,
-                        testDefinition=EntityReference(
-                            id=self.metadata.get_by_name(
-                                fqn=manifest_node.name,
-                                entity=TestDefinition,
-                            ).id.__root__,
-                            type="testDefinition",
+                        testDefinition=FullyQualifiedEntityName(
+                            __root__=manifest_node.name
                         ),
                         entityLink=entity_link,
-                        testSuite=EntityReference(
-                            id=self.metadata.get_by_name(
-                                fqn=test_suite_name, entity=TestSuite
-                            ).id.__root__,
-                            type="testSuite",
-                        ),
+                        testSuite=FullyQualifiedEntityName(__root__=test_suite_name),
                         parameterValues=self.create_test_case_parameter_values(
                             dbt_test
                         ),
diff --git a/ingestion/src/metadata/ingestion/source/database/glue/metadata.py b/ingestion/src/metadata/ingestion/source/database/glue/metadata.py
index 89011c340a5..01d8cd7da2e 100755
--- a/ingestion/src/metadata/ingestion/source/database/glue/metadata.py
+++ b/ingestion/src/metadata/ingestion/source/database/glue/metadata.py
@@ -37,6 +37,7 @@ from metadata.generated.schema.metadataIngestion.databaseServiceMetadataPipeline
 from metadata.generated.schema.metadataIngestion.workflow import (
     Source as WorkflowSource,
 )
+from metadata.generated.schema.type.entityReference import EntityReference
 from metadata.ingestion.api.source import InvalidSourceException, SourceStatus
 from metadata.ingestion.models.ometa_classification import OMetaTagAndClassification
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
@@ -308,7 +309,9 @@ class GlueSource(DatabaseServiceSource):
                 path=table["StorageDescriptor"]["Location"],
                 description=table.get("Description", ""),
                 locationType=location_type,
-                service=self.context.storage_service.fullyQualifiedName,
+                service=EntityReference(
+                    id=self.context.storage_service.id, type="storageService"
+                ),
             )
             yield location_request
         except Exception as exc: