diff --git a/playwright/element-web-test.ts b/playwright/element-web-test.ts
index 2973f88cdab..fea99ad21ad 100644
--- a/playwright/element-web-test.ts
+++ b/playwright/element-web-test.ts
@@ -224,7 +224,7 @@ export const test = base.extend<{
     },
 
     axe: async ({ page }, use) => {
-        await use(new AxeBuilder({ page }).exclude("[id^='floating-ui-']"));
+        await use(new AxeBuilder({ page }).exclude("[data-floating-ui-portal]"));
     },
     checkA11y: async ({ axe }, use, testInfo) =>
         use(async () => {
diff --git a/playwright/pages/ElementAppPage.ts b/playwright/pages/ElementAppPage.ts
index 81c57cc6f7d..4cff3c72eac 100644
--- a/playwright/pages/ElementAppPage.ts
+++ b/playwright/pages/ElementAppPage.ts
@@ -188,6 +188,6 @@ export class ElementAppPage {
                 "Element has no aria-labelledby or aria-describedy attributes! The tooltip should have added either one of these.",
             );
         }
-        return this.page.locator(`#${labelledById ?? describedById}`);
+        return this.page.locator(`id=${labelledById ?? describedById}`);
     }
 }
diff --git a/test/unit-tests/components/views/dialogs/__snapshots__/MessageEditHistoryDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/MessageEditHistoryDialog-test.tsx.snap
index 2bf4f9a705d..5f926ff703e 100644
--- a/test/unit-tests/components/views/dialogs/__snapshots__/MessageEditHistoryDialog-test.tsx.snap
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/MessageEditHistoryDialog-test.tsx.snap
@@ -102,7 +102,6 @@ exports[`<MessageEditHistory /> should match the snapshot 1`] = `
       </div>
     </div>
     <div
-      aria-describedby=":r2:"
       aria-label="Close dialog"
       class="mx_AccessibleButton mx_Dialog_cancelButton"
       role="button"
@@ -316,7 +315,6 @@ exports[`<MessageEditHistory /> should support events with 1`] = `
       </div>
     </div>
     <div
-      aria-describedby=":r8:"
       aria-label="Close dialog"
       class="mx_AccessibleButton mx_Dialog_cancelButton"
       role="button"