diff --git a/frontend/test/metabase/scenarios/filters/filter.cy.spec.js b/frontend/test/metabase/scenarios/filters/filter.cy.spec.js
index 25c733137585438e194d9c42b563c218e9d42e36..ba503aa7669b290016bfc63d3b8c6747ae352951 100644
--- a/frontend/test/metabase/scenarios/filters/filter.cy.spec.js
+++ b/frontend/test/metabase/scenarios/filters/filter.cy.spec.js
@@ -932,8 +932,9 @@ describe("scenarios > question > filter", () => {
       beforeEach(setupBooleanQuery);
 
       it("from the column popover (metabase#16386-1)", () => {
-        cy.get(".cellData")
+        cy.findAllByTestId("header-cell")
           .contains("boolean")
+          .should("be.visible")
           .click();
 
         popover()
diff --git a/frontend/test/metabase/scenarios/filters/reproductions/22730-table-column-time-filter.cy.spec.js b/frontend/test/metabase/scenarios/filters/reproductions/22730-table-column-time-filter.cy.spec.js
index 45e3f4821c72260fa5052549b7257c7d1f8eddca..f168ae7bafef611100b812c9f46c4e02c64734cd 100644
--- a/frontend/test/metabase/scenarios/filters/reproductions/22730-table-column-time-filter.cy.spec.js
+++ b/frontend/test/metabase/scenarios/filters/reproductions/22730-table-column-time-filter.cy.spec.js
@@ -14,22 +14,31 @@ describe("issue 22730", () => {
       },
       { visitQuestion: true },
     );
+
     cy.intercept("POST", "/api/dataset").as("dataset");
   });
 
   it("allows filtering by time column (metabase#22730)", () => {
     cy.findByText("Explore results").click();
-    cy.findByText("time").click();
+    cy.wait("@dataset");
+
+    cy.findAllByTestId("header-cell")
+      .contains("time")
+      .should("be.visible")
+      .click();
 
     popover().within(() => {
       cy.findByText("Filter by this column").click();
 
       cy.findByTestId("hours-input")
         .clear()
-        .type("14");
+        .type("14")
+        .blur();
+
       cy.findByTestId("minutes-input")
         .clear()
-        .type("03");
+        .type("03")
+        .blur();
 
       cy.button("Add filter").click();
     });