diff --git a/test/components/views/avatars/__snapshots__/DecoratedRoomAvatar-test.tsx.snap b/test/components/views/avatars/__snapshots__/DecoratedRoomAvatar-test.tsx.snap
index b060312070..02799451b9 100644
--- a/test/components/views/avatars/__snapshots__/DecoratedRoomAvatar-test.tsx.snap
+++ b/test/components/views/avatars/__snapshots__/DecoratedRoomAvatar-test.tsx.snap
@@ -16,7 +16,7 @@ exports[`DecoratedRoomAvatar shows an avatar with globe icon and tooltip for pub
       r
     </span>
     <div
-      aria-describedby="floating-ui-2"
+      aria-describedby=":r2:"
       class="mx_DecoratedRoomAvatar_icon mx_DecoratedRoomAvatar_icon_globe"
       tabindex="0"
     />
@@ -40,7 +40,7 @@ exports[`DecoratedRoomAvatar shows the presence indicator in a DM room that also
       r
     </span>
     <div
-      aria-describedby="floating-ui-8"
+      aria-describedby=":r8:"
       class="mx_DecoratedRoomAvatar_icon mx_DecoratedRoomAvatar_icon_online"
       tabindex="0"
     />
diff --git a/test/components/views/dialogs/__snapshots__/DevtoolsDialog-test.tsx.snap b/test/components/views/dialogs/__snapshots__/DevtoolsDialog-test.tsx.snap
index fca0dc9885..cdac78ef55 100644
--- a/test/components/views/dialogs/__snapshots__/DevtoolsDialog-test.tsx.snap
+++ b/test/components/views/dialogs/__snapshots__/DevtoolsDialog-test.tsx.snap
@@ -33,7 +33,7 @@ exports[`DevtoolsDialog renders the devtools dialog 1`] = `
     >
       Room ID: !id
       <div
-        aria-describedby="floating-ui-2"
+        aria-describedby=":r2:"
         aria-label="Copy"
         class="mx_AccessibleButton mx_CopyableText_copyButton"
         role="button"
diff --git a/test/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap b/test/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap
index 6594397511..9d5fd55154 100644
--- a/test/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap
+++ b/test/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap
@@ -73,7 +73,7 @@ exports[`LogoutDialog Prompts user to connect backup if there is a backup on the
       </details>
     </div>
     <div
-      aria-describedby="floating-ui-22"
+      aria-describedby=":r22:"
       aria-label="Close dialog"
       class="mx_AccessibleButton mx_Dialog_cancelButton"
       role="button"
@@ -161,7 +161,7 @@ exports[`LogoutDialog Prompts user to set up backup if there is no backup on the
       </details>
     </div>
     <div
-      aria-describedby="floating-ui-28"
+      aria-describedby=":r28:"
       aria-label="Close dialog"
       class="mx_AccessibleButton mx_Dialog_cancelButton"
       role="button"
diff --git a/test/components/views/dialogs/__snapshots__/MessageEditHistoryDialog-test.tsx.snap b/test/components/views/dialogs/__snapshots__/MessageEditHistoryDialog-test.tsx.snap
index 43f46d2edc..2bf4f9a705 100644
--- a/test/components/views/dialogs/__snapshots__/MessageEditHistoryDialog-test.tsx.snap
+++ b/test/components/views/dialogs/__snapshots__/MessageEditHistoryDialog-test.tsx.snap
@@ -102,7 +102,7 @@ exports[`<MessageEditHistory /> should match the snapshot 1`] = `
       </div>
     </div>
     <div
-      aria-describedby="floating-ui-2"
+      aria-describedby=":r2:"
       aria-label="Close dialog"
       class="mx_AccessibleButton mx_Dialog_cancelButton"
       role="button"
@@ -316,7 +316,7 @@ exports[`<MessageEditHistory /> should support events with 1`] = `
       </div>
     </div>
     <div
-      aria-describedby="floating-ui-8"
+      aria-describedby=":r8:"
       aria-label="Close dialog"
       class="mx_AccessibleButton mx_Dialog_cancelButton"
       role="button"
diff --git a/test/components/views/elements/__snapshots__/ImageView-test.tsx.snap b/test/components/views/elements/__snapshots__/ImageView-test.tsx.snap
index 93d6d3a357..ce2b8211d8 100644
--- a/test/components/views/elements/__snapshots__/ImageView-test.tsx.snap
+++ b/test/components/views/elements/__snapshots__/ImageView-test.tsx.snap
@@ -21,7 +21,7 @@ exports[`<ImageView /> renders correctly 1`] = `
         class="mx_ImageView_toolbar"
       >
         <div
-          aria-describedby="floating-ui-2"
+          aria-describedby=":r2:"
           aria-label="Zoom out"
           class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_zoomOut"
           role="button"
diff --git a/test/components/views/elements/__snapshots__/InfoTooltip-test.tsx.snap b/test/components/views/elements/__snapshots__/InfoTooltip-test.tsx.snap
index 57cbf5d171..2d2541e361 100644
--- a/test/components/views/elements/__snapshots__/InfoTooltip-test.tsx.snap
+++ b/test/components/views/elements/__snapshots__/InfoTooltip-test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`InfoTooltip should show tooltip on hover 1`] = `
 <DocumentFragment>
   <div
-    aria-describedby="floating-ui-2"
+    aria-describedby=":r2:"
     class="mx_InfoTooltip"
     tabindex="0"
   >
diff --git a/test/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap b/test/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap
index ffc676e30c..2886a826c8 100644
--- a/test/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap
+++ b/test/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap
@@ -23,7 +23,6 @@ exports[`<LocationViewDialog /> renders map correctly 1`] = `
     class="mx_ZoomButtons"
   >
     <div
-      aria-describedby="floating-ui-6"
       aria-label="Zoom in"
       class="mx_AccessibleButton mx_ZoomButtons_button"
       data-testid="map-zoom-in-button"
diff --git a/test/components/views/messages/MPollBody-test.tsx b/test/components/views/messages/MPollBody-test.tsx
index 0ab99f63fb..2fcd0e517f 100644
--- a/test/components/views/messages/MPollBody-test.tsx
+++ b/test/components/views/messages/MPollBody-test.tsx
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
-import { fireEvent, render, RenderResult } from "@testing-library/react";
+import { fireEvent, render, RenderResult, waitForElementToBeRemoved } from "@testing-library/react";
 import {
     MatrixEvent,
     Relations,
@@ -895,9 +895,11 @@ async function newMPollBody(
         content: newPollStart(answers, undefined, disclosed),
     });
     const result = newMPollBodyFromEvent(mxEvent, relationEvents, endEvents);
-    // flush promises from loading relations
     if (waitForResponsesLoad) {
+        // flush promises from loading relations
         await flushPromises();
+        const renderResult = await result;
+        await waitForElementToBeRemoved(() => renderResult.getByTestId("spinner"));
     }
     return result;
 }
diff --git a/test/components/views/rooms/__snapshots__/ReadReceiptGroup-test.tsx.snap b/test/components/views/rooms/__snapshots__/ReadReceiptGroup-test.tsx.snap
index 2b5fa463ca..a6b23eb494 100644
--- a/test/components/views/rooms/__snapshots__/ReadReceiptGroup-test.tsx.snap
+++ b/test/components/views/rooms/__snapshots__/ReadReceiptGroup-test.tsx.snap
@@ -2,10 +2,10 @@
 
 exports[`ReadReceiptGroup <ReadReceiptPerson /> should display a tooltip 1`] = `
 <div
-  aria-describedby="floating-ui-5"
-  aria-labelledby="floating-ui-4"
+  aria-describedby=":r5:"
+  aria-labelledby=":r4:"
   class="_tooltip_svz44_17"
-  id="floating-ui-6"
+  id=":r6:"
   role="tooltip"
   style="position: absolute; left: 0px; top: 0px; transform: translate(0px, 0px);"
   tabindex="-1"
@@ -23,7 +23,7 @@ exports[`ReadReceiptGroup <ReadReceiptPerson /> should display a tooltip 1`] = `
       stroke="none"
     />
     <clippath
-      id="floating-ui-9"
+      id=":r9:"
     >
       <rect
         height="10"
@@ -34,13 +34,13 @@ exports[`ReadReceiptGroup <ReadReceiptPerson /> should display a tooltip 1`] = `
     </clippath>
   </svg>
   <span
-    id="floating-ui-4"
+    id=":r4:"
   >
     Alice
   </span>
   <span
     class="_caption_svz44_29 cpd-theme-dark"
-    id="floating-ui-5"
+    id=":r5:"
   >
     @alice:example.org
   </span>
diff --git a/test/components/views/spaces/__snapshots__/SpacePanel-test.tsx.snap b/test/components/views/spaces/__snapshots__/SpacePanel-test.tsx.snap
index 14133f22ab..1d0d0a04f5 100644
--- a/test/components/views/spaces/__snapshots__/SpacePanel-test.tsx.snap
+++ b/test/components/views/spaces/__snapshots__/SpacePanel-test.tsx.snap
@@ -229,8 +229,8 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
       class="mx_ThreadsActivityCentre_container"
     >
       <button
-        aria-controls="floating-ui-39"
-        aria-describedby="floating-ui-39"
+        aria-controls=":r39:"
+        aria-describedby=":r39:"
         aria-expanded="true"
         aria-haspopup="dialog"
         aria-label="Threads"
diff --git a/test/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap b/test/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap
index 1e1ed87e6c..0238347444 100644
--- a/test/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap
+++ b/test/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap
@@ -432,8 +432,8 @@ exports[`ThreadsActivityCentre should render the release announcement 1`] = `
       class="mx_ThreadsActivityCentre_container"
     >
       <button
-        aria-controls="floating-ui-6"
-        aria-describedby="floating-ui-6"
+        aria-controls=":r6:"
+        aria-describedby=":r6:"
         aria-expanded="true"
         aria-haspopup="dialog"
         aria-label="Threads"
@@ -459,7 +459,7 @@ exports[`ThreadsActivityCentre should render the release announcement 1`] = `
         tabindex="0"
       />
       <span
-        aria-owns="floating-ui-12"
+        aria-owns=":r12:"
         style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
       />
       <span
@@ -473,7 +473,7 @@ exports[`ThreadsActivityCentre should render the release announcement 1`] = `
   </div>
   <div
     data-floating-ui-portal=""
-    id="floating-ui-12"
+    id=":r12:"
   >
     <span
       data-floating-ui-focus-guard=""
@@ -484,10 +484,10 @@ exports[`ThreadsActivityCentre should render the release announcement 1`] = `
       tabindex="0"
     />
     <div
-      aria-describedby="floating-ui-5"
-      aria-labelledby="floating-ui-4"
+      aria-describedby=":r5:"
+      aria-labelledby=":r4:"
       class="_content_1oa1y_17"
-      id="floating-ui-6"
+      id=":r6:"
       role="dialog"
       style="position: absolute; left: 0px; top: 0px; transform: translate(0px, 0px);"
       tabindex="-1"
@@ -505,7 +505,7 @@ exports[`ThreadsActivityCentre should render the release announcement 1`] = `
           stroke="none"
         />
         <clippath
-          id="floating-ui-13"
+          id=":r13:"
         >
           <rect
             height="20"
@@ -517,13 +517,13 @@ exports[`ThreadsActivityCentre should render the release announcement 1`] = `
       </svg>
       <h3
         class="_typography_yh5dq_162 _font-body-lg-semibold_yh5dq_83 _header_1oa1y_46"
-        id="floating-ui-4"
+        id=":r4:"
       >
         Threads Activity Centre
       </h3>
       <span
         class="_typography_yh5dq_162 _font-body-sm-regular_yh5dq_40 _description_1oa1y_52"
-        id="floating-ui-5"
+        id=":r5:"
       >
         Threads notifications have moved, find them here from now on.
       </span>