diff --git a/e2e/test/scenarios/sharing/reproductions/20393-public-dashboard-nested-card-with-parameters.cy.spec.js b/e2e/test/scenarios/sharing/reproductions/20393-public-dashboard-nested-card-with-parameters.cy.spec.js
index 08d584b76e1559ba489b60aaadd8c32f0e8265f9..e9034c79763499cb35e53976262e17d3abf60ab0 100644
--- a/e2e/test/scenarios/sharing/reproductions/20393-public-dashboard-nested-card-with-parameters.cy.spec.js
+++ b/e2e/test/scenarios/sharing/reproductions/20393-public-dashboard-nested-card-with-parameters.cy.spec.js
@@ -2,6 +2,8 @@ import { restore, popover, visitDashboard } from "e2e/support/helpers";
 
 describe("issue 20393", () => {
   beforeEach(() => {
+    cy.intercept("POST", "/api/dashboard/*/public_link").as("publicLink");
+
     restore();
     cy.signInAsAdmin();
   });
@@ -28,14 +30,12 @@ describe("issue 20393", () => {
     cy.findByRole("switch").click();
 
     // navigate to the public dashboard link
-    // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
-    cy.findByText("Public link")
-      .parent()
-      .within(() => {
-        cy.get("input").then(input => {
-          cy.visit(input.val());
-        });
-      });
+    cy.wait("@publicLink").then(({ response: { body } }) => {
+      const { uuid } = body;
+
+      cy.signOut();
+      cy.visit(`/public/dashboard/${uuid}`);
+    });
 
     // verify that the card is visible on the page
     // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
diff --git a/e2e/test/scenarios/sharing/reproductions/22524-public-dashboard-updates-after-changing-parameters.cy.spec.js b/e2e/test/scenarios/sharing/reproductions/22524-public-dashboard-updates-after-changing-parameters.cy.spec.js
index 2dfd77ba6f7db3b9bced86556ea2c4924ac5739c..4b9f064fca7771dee7c5e42c7c380b31a985d085 100644
--- a/e2e/test/scenarios/sharing/reproductions/22524-public-dashboard-updates-after-changing-parameters.cy.spec.js
+++ b/e2e/test/scenarios/sharing/reproductions/22524-public-dashboard-updates-after-changing-parameters.cy.spec.js
@@ -31,6 +31,9 @@ describe("issue 22524", () => {
   it("update dashboard cards when changing parameters on publicly shared dashboards (metabase#22524)", () => {
     cy.createNativeQuestionAndDashboard({ questionDetails }).then(
       ({ body: { dashboard_id } }) => {
+        cy.intercept("POST", `/api/dashboard/${dashboard_id}/public_link`).as(
+          "publicLink",
+        );
         visitDashboard(dashboard_id);
       },
     );
@@ -48,14 +51,12 @@ describe("issue 22524", () => {
     cy.icon("share").click();
     cy.findByRole("switch").click();
 
-    // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
-    cy.findByText("Public link")
-      .parent()
-      .within(() => {
-        cy.get("input").then(input => {
-          cy.visit(input.val());
-        });
-      });
+    cy.wait("@publicLink").then(({ response: { body } }) => {
+      const { uuid } = body;
+
+      cy.signOut();
+      cy.visit(`/public/dashboard/${uuid}`);
+    });
 
     // Set parameter value
     cy.findByPlaceholderText("Text").clear().type("Rye{enter}");