diff --git a/client/cypress/integration/user/logout_spec.js b/client/cypress/integration/user/logout_spec.js
index 0b77d98922..dc8be6376c 100644
--- a/client/cypress/integration/user/logout_spec.js
+++ b/client/cypress/integration/user/logout_spec.js
@@ -8,8 +8,7 @@ describe("Logout", () => {
     cy.getByTestId("ProfileDropdown").click();
     // Wait until submenu appears and become interactive
     cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
-    cy.getByTestId("LogOutButton").should("be.visible");
-    cy.getByTestId("LogOutButton").click();
+    cy.getByTestId("LogOutButton").should("be.visible").click();
 
     cy.title().should("eq", "Login to Redash");
   });
diff --git a/client/cypress/integration/visualizations/table/table_spec.js b/client/cypress/integration/visualizations/table/table_spec.js
index 1dc5147a41..809965f63c 100644
--- a/client/cypress/integration/visualizations/table/table_spec.js
+++ b/client/cypress/integration/visualizations/table/table_spec.js
@@ -43,10 +43,8 @@ describe("Table", () => {
     const { query, config } = AllCellTypes;
     prepareVisualization(query, "TABLE", "All cell types", config).then(() => {
       // expand JSON cell
-      cy.get(".jvi-item.jvi-root .jvi-toggle").should("be.visible");
-      cy.get(".jvi-item.jvi-root .jvi-toggle").click();
-      cy.get(".jvi-item.jvi-root .jvi-item .jvi-toggle").should("be.visible");
-      cy.get(".jvi-item.jvi-root .jvi-item .jvi-toggle").click({ multiple: true });
+      cy.get(".jvi-item.jvi-root .jvi-toggle").should("be.visible").click();
+      cy.get(".jvi-item.jvi-root .jvi-item .jvi-toggle").should("be.visible").click({ multiple: true });
 
       cy.percySnapshot("Visualizations - Table (All cell types)", { widths: [viewportWidth] });
     });