diff --git a/datahub-web-react/src/app/search/autoComplete/AutoCompleteEntity.tsx b/datahub-web-react/src/app/search/autoComplete/AutoCompleteEntity.tsx
index 1942497057304..8a87407b7176b 100644
--- a/datahub-web-react/src/app/search/autoComplete/AutoCompleteEntity.tsx
+++ b/datahub-web-react/src/app/search/autoComplete/AutoCompleteEntity.tsx
@@ -63,7 +63,7 @@ export default function AutoCompleteEntity({ query, entity, hasParentTooltip }:
     const subtype = genericEntityProps?.subTypes?.typeNames?.[0];
 
     return (
-        <AutoCompleteEntityWrapper>
+        <AutoCompleteEntityWrapper data-testid={`auto-complete-entity-name-${displayName}`}>
             <ContentWrapper>
                 {icon}
                 <SuggestionText>
diff --git a/datahub-web-react/src/app/search/autoComplete/AutoCompleteItem.tsx b/datahub-web-react/src/app/search/autoComplete/AutoCompleteItem.tsx
index 84a5e283cf069..c97d171b4c931 100644
--- a/datahub-web-react/src/app/search/autoComplete/AutoCompleteItem.tsx
+++ b/datahub-web-react/src/app/search/autoComplete/AutoCompleteItem.tsx
@@ -45,9 +45,7 @@ export default function AutoCompleteItem({ query, entity }: Props) {
             placement="top"
             color="rgba(0, 0, 0, 0.9)"
         >
-            <SuggestionContainer data-testid={`auto-complete-option--${entity.urn}`}>
-                {componentToRender}
-            </SuggestionContainer>
+            <SuggestionContainer data-testid="auto-complete-option">{componentToRender}</SuggestionContainer>
         </Tooltip>
     );
 }
diff --git a/smoke-test/tests/cypress/cypress/e2e/auto_complete/auto_complete.js b/smoke-test/tests/cypress/cypress/e2e/auto_complete/auto_complete.js
index 7221956611b1c..adff124ca857c 100644
--- a/smoke-test/tests/cypress/cypress/e2e/auto_complete/auto_complete.js
+++ b/smoke-test/tests/cypress/cypress/e2e/auto_complete/auto_complete.js
@@ -39,12 +39,12 @@ describe("auto-complete", () => {
     cy.visit("/");
     cy.get("input[data-testid=search-input]").type("baz");
 
-    cy.get('[data-testid="auto-complete-option--urn:li:chart:(looker,baz2)"');
+    cy.get('[data-testid="auto-complete-entity-name-Baz Chart 2');
     cy.get('[data-testid="quick-filter-DASHBOARD"]').click();
     cy.wait(2000);
-    cy.get(
-      '[data-testid="auto-complete-option--urn:li:chart:(looker,baz2)"'
-    ).should("not.exist");
+    cy.get('[data-testid="auto-complete-entity-name-Baz Chart 2').should(
+      "not.exist"
+    );
     cy.contains("Baz Dashboard");
     cy.wait(1000);
   });