diff --git a/ui/src/e2e/model-setup-reconnect.e2e.test.ts b/ui/src/e2e/model-setup-reconnect.e2e.test.ts
index 509aa7c4c2b7..e600d1e9fa5b 100644
--- a/ui/src/e2e/model-setup-reconnect.e2e.test.ts
+++ b/ui/src/e2e/model-setup-reconnect.e2e.test.ts
@@ -67,7 +67,7 @@ describeControlUiE2e("Control UI model setup same-client reconnect", () => {
     try {
       const response = await page.goto(`${server.baseUrl}settings/model-setup`);
       expect(response?.status()).toBe(200);
-      await page.getByText("provider/original-model").waitFor();
+      await page.getByText("original-model", { exact: true }).waitFor();
       const initialDetections = (await gateway.getRequests("openclaw.setup.detect")).length;
       const initialConnections = (await gateway.getRequests("connect")).length;
       await gateway.setMethodResponse(
@@ -76,7 +76,9 @@ describeControlUiE2e("Control UI model setup same-client reconnect", () => {
       );
       await gateway.deferNext("connect");
       await gateway.closeLatest(1012, "model setup reconnect proof");
-      await expect.poll(async () => page.getByText("provider/original-model").count()).toBe(0);
+      await expect
+        .poll(async () => page.getByText("original-model", { exact: true }).count())
+        .toBe(0);
       await expect
         .poll(async () => (await gateway.getRequests("connect")).length)
         .toBeGreaterThan(initialConnections);
@@ -84,7 +86,7 @@ describeControlUiE2e("Control UI model setup same-client reconnect", () => {
       await expect
         .poll(async () => (await gateway.getRequests("openclaw.setup.detect")).length)
         .toBe(initialDetections + 1);
-      await page.getByText("provider/reconnected-model").waitFor();
+      await page.getByText("reconnected-model", { exact: true }).waitFor();
       expect(pageErrors).toEqual([]);
 
       if (captureUiProofEnabled) {
diff --git a/ui/src/e2e/model-setup.e2e.test.ts b/ui/src/e2e/model-setup.e2e.test.ts
index 3228e393058b..0b0a7d56fd0c 100644
--- a/ui/src/e2e/model-setup.e2e.test.ts
+++ b/ui/src/e2e/model-setup.e2e.test.ts
@@ -872,17 +872,21 @@ describeControlUiE2e("Control UI Model Setup mocked Gateway E2E", () => {
         });
         await page.setViewportSize({ height: 900, width: 1280 });
       }
-      await page.getByRole("button", { name: "Verify connection" }).click();
+      await page.getByRole("button", { name: "Check model" }).click();
       const verify = await gateway.waitForRequest("openclaw.setup.verify");
       expect(verify.params).toEqual({});
-      await page.getByText("Answered in 1234 ms").waitFor();
+      await page.getByText("Ready · 1234 ms").waitFor();
       const detectCountBeforeRefresh = (await gateway.getRequests("openclaw.setup.detect")).length;
+      const verifyCountBeforeRefresh = (await gateway.getRequests("openclaw.setup.verify")).length;
       await page.getByRole("button", { name: "Check again" }).click();
       await expect
-        .poll(async () => (await gateway.getRequests("openclaw.setup.detect")).length)
-        .toBe(detectCountBeforeRefresh + 1);
-      await page.getByRole("button", { name: "Verify connection" }).waitFor();
-      expect(await page.getByText("Answered in 1234 ms").count()).toBe(0);
+        .poll(async () => (await gateway.getRequests("openclaw.setup.verify")).length)
+        .toBe(verifyCountBeforeRefresh + 1);
+      expect((await gateway.getRequests("openclaw.setup.detect")).length).toBe(
+        detectCountBeforeRefresh,
+      );
+      await page.getByRole("button", { name: "Check again" }).waitFor();
+      await page.getByText("Ready · 1234 ms").waitFor();
     } finally {
       await context.close();
     }