diff --git a/cypress/e2e/integration-manager/send_event.spec.ts b/cypress/e2e/integration-manager/send_event.spec.ts
index a62188b95e..d8a746b423 100644
--- a/cypress/e2e/integration-manager/send_event.spec.ts
+++ b/cypress/e2e/integration-manager/send_event.spec.ts
@@ -67,7 +67,7 @@ const INTEGRATION_MANAGER_HTML = `
 `;
 
 function openIntegrationManager() {
-    cy.findByRole("tab", { name: "Room info" }).click();
+    cy.findByRole("button", { name: "Room info" }).click();
     cy.get(".mx_RoomSummaryCard_appsGroup").within(() => {
         cy.findByRole("button", { name: "Add widgets, bridges & bots" }).click();
     });
diff --git a/cypress/e2e/lazy-loading/lazy-loading.spec.ts b/cypress/e2e/lazy-loading/lazy-loading.spec.ts
index 1efc69e032..6e53fc33da 100644
--- a/cypress/e2e/lazy-loading/lazy-loading.spec.ts
+++ b/cypress/e2e/lazy-loading/lazy-loading.spec.ts
@@ -117,7 +117,7 @@ describe("Lazy Loading", () => {
 
     function openMemberlist(): void {
         cy.get(".mx_HeaderButtons").within(() => {
-            cy.findByRole("tab", { name: "Room info" }).click();
+            cy.findByRole("button", { name: "Room info" }).click();
         });
 
         cy.get(".mx_RoomSummaryCard").within(() => {
diff --git a/cypress/e2e/polls/pollHistory.spec.ts b/cypress/e2e/polls/pollHistory.spec.ts
index 93eefc49d2..00938ab768 100644
--- a/cypress/e2e/polls/pollHistory.spec.ts
+++ b/cypress/e2e/polls/pollHistory.spec.ts
@@ -75,7 +75,7 @@ describe("Poll history", () => {
     };
 
     function openPollHistory(): void {
-        cy.findByRole("tab", { name: "Room info" }).click();
+        cy.findByRole("button", { name: "Room info" }).click();
         cy.get(".mx_RoomSummaryCard").within(() => {
             cy.findByRole("button", { name: "Poll history" }).click();
         });
diff --git a/cypress/e2e/right-panel/file-panel.spec.ts b/cypress/e2e/right-panel/file-panel.spec.ts
index 318167bb1e..f2e0e0a013 100644
--- a/cypress/e2e/right-panel/file-panel.spec.ts
+++ b/cypress/e2e/right-panel/file-panel.spec.ts
@@ -24,7 +24,7 @@ const NAME = "Alice";
 
 const viewRoomSummaryByName = (name: string): Chainable<JQuery<HTMLElement>> => {
     cy.viewRoomByName(name);
-    cy.findByRole("tab", { name: "Room info" }).click();
+    cy.findByRole("button", { name: "Room info" }).click();
     return checkRoomSummaryCard(name);
 };
 
diff --git a/cypress/e2e/sliding-sync/sliding-sync.ts b/cypress/e2e/sliding-sync/sliding-sync.ts
index 6caa01a990..b7eccb77c6 100644
--- a/cypress/e2e/sliding-sync/sliding-sync.ts
+++ b/cypress/e2e/sliding-sync/sliding-sync.ts
@@ -241,9 +241,7 @@ describe("Sliding Sync", () => {
     });
 
     it("should update user settings promptly", () => {
-        cy.findByRole("button", { name: "User menu" }).click();
-        cy.findByRole("menuitem", { name: "All settings" }).click();
-        cy.findByRole("button", { name: "Preferences" }).click();
+        cy.openUserSettings("Preferences");
         cy.contains(".mx_SettingsFlag", "Show timestamps in 12 hour format")
             .should("exist")
             .find(".mx_ToggleSwitch_on")
diff --git a/cypress/e2e/threads/threads.spec.ts b/cypress/e2e/threads/threads.spec.ts
index 63546bd417..465aeb9520 100644
--- a/cypress/e2e/threads/threads.spec.ts
+++ b/cypress/e2e/threads/threads.spec.ts
@@ -295,7 +295,7 @@ describe("Threads", () => {
             cy.get(".mx_ThreadSummary_content").findByText("How are things?").should("exist");
         });
 
-        cy.findByRole("tab", { name: "Threads" })
+        cy.findByRole("button", { name: "Threads" })
             .should("have.class", "mx_RightPanel_headerButton_unread") // User asserts thread list unread indicator
             .click(); // User opens thread list