diff --git a/src/frontend/tests/extended/features/mcp-server-tab.spec.ts b/src/frontend/tests/extended/features/mcp-server-tab.spec.ts
index fbd4e722c..3124ee27e 100644
--- a/src/frontend/tests/extended/features/mcp-server-tab.spec.ts
+++ b/src/frontend/tests/extended/features/mcp-server-tab.spec.ts
@@ -95,8 +95,9 @@ test(
         // Select first action
         await page
           .locator('input[data-ref="eInput"]')
-          .nth(rowsCount + 1)
-          .click();
+          .last()
+          .scrollIntoViewIfNeeded();
+        await page.locator('input[data-ref="eInput"]').last().click();
         await page.waitForTimeout(1000);
 
         await page
@@ -107,7 +108,7 @@ test(
 
         const isLastChecked = await page
           .locator('input[data-ref="eInput"]')
-          .nth(rowsCount + 1)
+          .last()
           .isChecked();
 
         expect(isLastChecked).toBeTruthy();
diff --git a/src/frontend/tests/extended/features/notifications.spec.ts b/src/frontend/tests/extended/features/notifications.spec.ts
index efefb12dd..ca3704520 100644
--- a/src/frontend/tests/extended/features/notifications.spec.ts
+++ b/src/frontend/tests/extended/features/notifications.spec.ts
@@ -25,8 +25,12 @@ test(
         await page.getByTestId("button_run_text input").click();
       });
 
-    await page.waitForSelector("text=built successfully", { timeout: 30000 });
+    await page.waitForSelector("text=Running", {
+      timeout: 30000,
+      state: "visible",
+    });
 
+    await page.waitForSelector("text=built successfully", { timeout: 30000 });
     await page.getByTestId("notification_button").click();
 
     // Add explicit waits before checking visibility
@@ -35,10 +39,6 @@ test(
       state: "visible",
     });
 
-    await page.waitForSelector("text=Running", {
-      timeout: 30000,
-      state: "visible",
-    });
     // Then check visibility
     const notificationsText = page
       .getByText("Notifications", { exact: true })
@@ -48,9 +48,6 @@ test(
     const trashIcon = page.getByTestId("icon-Trash2").last();
     await expect(trashIcon).toBeVisible();
 
-    const runningComponentsText = page.getByText("Running").last();
-    await expect(runningComponentsText).toBeVisible();
-
     const builtSuccessfullyText = page
       .getByText("Flow built successfully", { exact: true })
       .last();
diff --git a/src/frontend/tests/extended/regression/general-bugs-shard-3909.spec.ts b/src/frontend/tests/extended/regression/general-bugs-shard-3909.spec.ts
index 9a2432577..7da8f1580 100644
--- a/src/frontend/tests/extended/regression/general-bugs-shard-3909.spec.ts
+++ b/src/frontend/tests/extended/regression/general-bugs-shard-3909.spec.ts
@@ -39,7 +39,7 @@ test(
     await page.getByTestId("side_nav_options_all-templates").click();
     await page.getByRole("heading", { name: "Basic Prompting" }).click();
     await page.waitForSelector("text=playground", { timeout: 30000 });
-    await page.waitForSelector("text=publish", { timeout: 30000 });
+    await page.waitForSelector("text=share", { timeout: 30000 });
 
     await expect(page.getByTestId("button_run_chat output")).toBeVisible({
       timeout: 30000,