diff --git a/tests/e2e/ui/tests/guardrails/presidioUserStory.spec.ts b/tests/e2e/ui/tests/guardrails/presidioUserStory.spec.ts
index ff4d6260312..d4ed5308342 100644
--- a/tests/e2e/ui/tests/guardrails/presidioUserStory.spec.ts
+++ b/tests/e2e/ui/tests/guardrails/presidioUserStory.spec.ts
@@ -137,17 +137,17 @@ test.describe("Presidio PII guardrail, end to end from the dashboard", () => {
     await row.click();
 
     const drawer = page.getByRole("dialog").first();
-    await expect(drawer.getByText("Guardrails & Policy Compliance")).toBeVisible({ timeout: 20_000 });
-    await expect(drawer.getByText(`Pre-call guardrail: ${guardrailName}`).first()).toBeVisible({ timeout: 20_000 });
-    const maskedPrompt = onlyVisible(drawer.getByText(`${marker}. Email me at <EMAIL_ADDRESS> or call <PHONE_NUMBER>.`));
-    await expect(maskedPrompt).toBeVisible({ timeout: 20_000 });
+    await expect(onlyVisible(drawer.getByText("Guardrails & Policy Compliance"))).toBeVisible({ timeout: 20_000 });
+    await expect(onlyVisible(drawer.getByText(`Pre-call guardrail: ${guardrailName}`))).toBeVisible({ timeout: 20_000 });
+    const maskedPrompt = drawer.getByText(`${marker}. Email me at <EMAIL_ADDRESS> or call <PHONE_NUMBER>.`);
+    await expect(onlyVisible(maskedPrompt)).toBeVisible({ timeout: 20_000 });
 
-    await drawer.getByText("2 matched").first().click();
-    await expect(drawer.getByText("Detected Entities (2)").first()).toBeVisible({ timeout: 10_000 });
-    await expect(drawer.getByText("EMAIL_ADDRESS").first()).toBeVisible({ timeout: 10_000 });
-    await expect(drawer.getByText("PHONE_NUMBER").first()).toBeVisible({ timeout: 10_000 });
-    await expect(drawer.getByText("Score: 1.00").first()).toBeVisible({ timeout: 10_000 });
-    await expect(drawer.getByText("Score: 0.75").first()).toBeVisible({ timeout: 10_000 });
+    await onlyVisible(drawer.getByText("2 matched")).click();
+    await expect(onlyVisible(drawer.getByText("Detected Entities (2)"))).toBeVisible({ timeout: 10_000 });
+    await expect(onlyVisible(drawer.getByText("EMAIL_ADDRESS", { exact: true }))).toBeVisible({ timeout: 10_000 });
+    await expect(onlyVisible(drawer.getByText("PHONE_NUMBER", { exact: true }))).toBeVisible({ timeout: 10_000 });
+    await expect(onlyVisible(drawer.getByText("Score: 1.00", { exact: true }))).toBeVisible({ timeout: 10_000 });
+    await expect(onlyVisible(drawer.getByText("Score: 0.75", { exact: true }))).toBeVisible({ timeout: 10_000 });
 
     await expect(drawer.getByText(RAW_EMAIL)).toHaveCount(0);
     await expect(drawer.getByText(RAW_PHONE)).toHaveCount(0);