diff --git a/frontend/test/metabase/scenarios/joins/reproductions/18502-cannot-join-two-saved-questions-same-table.cy.spec.js b/frontend/test/metabase/scenarios/joins/reproductions/18502-cannot-join-two-saved-questions-same-table.cy.spec.js
index fa48abefbd9afd9e00887dfc1992539f1026a004..2f79f8aaf20fad993812c802dae4b0f5b042c0fc 100644
--- a/frontend/test/metabase/scenarios/joins/reproductions/18502-cannot-join-two-saved-questions-same-table.cy.spec.js
+++ b/frontend/test/metabase/scenarios/joins/reproductions/18502-cannot-join-two-saved-questions-same-table.cy.spec.js
@@ -14,6 +14,8 @@ describe("issue 18502", () => {
   });
 
   it("should be able to join two saved questions based on the same table (metabase#18502)", () => {
+    cy.intercept("/api/database/1/schema/PUBLIC").as("schema");
+
     cy.createQuestion(question1);
     cy.createQuestion(question2);
 
@@ -23,6 +25,7 @@ describe("issue 18502", () => {
 
     cy.findByText("18502#1").click();
     cy.icon("join_left_outer").click();
+    cy.wait("@schema");
 
     popover().within(() => {
       cy.findByTextEnsureVisible("Sample Database").click();
diff --git a/frontend/test/metabase/scenarios/joins/reproductions/18512-cannot-join-two-saved-questions-with-same-implicit-explicit-grouped-field.cy.spec.js b/frontend/test/metabase/scenarios/joins/reproductions/18512-cannot-join-two-saved-questions-with-same-implicit-explicit-grouped-field.cy.spec.js
index 3159a2290da937ad5fa0cd667d49dc380fd1d1ab..a6e3de9b0e016341f24a6a0ce8fe7ce1af8a2998 100644
--- a/frontend/test/metabase/scenarios/joins/reproductions/18512-cannot-join-two-saved-questions-with-same-implicit-explicit-grouped-field.cy.spec.js
+++ b/frontend/test/metabase/scenarios/joins/reproductions/18512-cannot-join-two-saved-questions-with-same-implicit-explicit-grouped-field.cy.spec.js
@@ -15,6 +15,8 @@ describe("issue 18512", () => {
   });
 
   it("should join two saved questions with the same implicit/explicit grouped field (metabase#18512)", () => {
+    cy.intercept("/api/database/1/schema/PUBLIC").as("schema");
+
     cy.createQuestion(question1);
     cy.createQuestion(question2);
 
@@ -24,6 +26,7 @@ describe("issue 18512", () => {
 
     cy.findByText("18512#1").click();
     cy.icon("join_left_outer").click();
+    cy.wait("@schema");
 
     popover().within(() => {
       cy.findByTextEnsureVisible("Sample Database").click();