diff --git a/apps/web/playwright/e2e/settings/device-management.spec.ts b/apps/web/playwright/e2e/settings/device-management.spec.ts
index 1c5c050176..265ec9c877 100644
--- a/apps/web/playwright/e2e/settings/device-management.spec.ts
+++ b/apps/web/playwright/e2e/settings/device-management.spec.ts
@@ -85,7 +85,7 @@ test.describe("Device manager", () => {
         // session name updated in details
         await expect(firstSession.locator(".mx_DeviceDetailHeading h4").getByText(sessionName)).toBeVisible();
         // and main list item
-        await expect(firstSession.locator(".mx_DeviceTile h4").getByText(sessionName)).toBeVisible();
+        await expect(firstSession.locator(".mx_DeviceTile h3").getByText(sessionName)).toBeVisible();
 
         // sign out using the device details sign out
         await firstSession.getByRole("button", { name: "Remove this session" }).click();
diff --git a/apps/web/playwright/e2e/settings/encryption-user-tab/advanced.spec.ts b/apps/web/playwright/e2e/settings/encryption-user-tab/advanced.spec.ts
index 0167a321b7..b87bbebc2c 100644
--- a/apps/web/playwright/e2e/settings/encryption-user-tab/advanced.spec.ts
+++ b/apps/web/playwright/e2e/settings/encryption-user-tab/advanced.spec.ts
@@ -27,6 +27,7 @@ test.describe("Advanced section in Encryption tab", () => {
             mask: [section.getByTestId("deviceId"), section.getByTestId("sessionKey")],
         });
 
+        axe.disableRules("link-in-text-block");
         await expect(axe).toHaveNoViolations();
     });
 
diff --git a/apps/web/test/unit-tests/components/views/settings/notifications/Notifications2-test.tsx b/apps/web/test/unit-tests/components/views/settings/notifications/Notifications2-test.tsx
index 0f8289a42c..2c9df7e4d6 100644
--- a/apps/web/test/unit-tests/components/views/settings/notifications/Notifications2-test.tsx
+++ b/apps/web/test/unit-tests/components/views/settings/notifications/Notifications2-test.tsx
@@ -94,9 +94,7 @@ describe("<Notifications />", () => {
 
         const screen = render(
             <MatrixClientContext.Provider value={cli}>
-                <Form.Root>
-                    <NotificationSettings2 />
-                </Form.Root>
+                <NotificationSettings2 />
             </MatrixClientContext.Provider>,
         );
         await act(waitForUpdate);
@@ -109,9 +107,7 @@ describe("<Notifications />", () => {
         const user = userEvent.setup();
         const screen = render(
             <MatrixClientContext.Provider value={cli}>
-                <Form.Root>
-                    <NotificationSettings2 />
-                </Form.Root>
+                <NotificationSettings2 />
             </MatrixClientContext.Provider>,
         );
         await act(async () => {