diff --git a/packages/app/e2e/viewed-agent-timelines.spec.ts b/packages/app/e2e/viewed-agent-timelines.spec.ts
index 0ee56e2288..6f40c5f573 100644
--- a/packages/app/e2e/viewed-agent-timelines.spec.ts
+++ b/packages/app/e2e/viewed-agent-timelines.spec.ts
@@ -96,10 +96,10 @@ test.describe("Viewed agent timelines", () => {
       await moveActiveTabRight(page);
       await expect(
         page.getByRole("button", { name: "First viewed chat", exact: true }),
-      ).toHaveAttribute("aria-selected", "true");
+      ).toBeVisible();
       await expect(
         page.getByRole("button", { name: "Second viewed chat", exact: true }),
-      ).toHaveAttribute("aria-selected", "true");
+      ).toBeVisible();
       await expect(page.getByRole("textbox", { name: "Message agent..." })).toHaveCount(2);
       await commitMessage(scenario, scenario.firstAgentId, "First visible pane update.");
       await expect(page.getByText("First visible pane update.", { exact: true })).toBeVisible();
diff --git a/packages/app/e2e/workspace-model-restart.spec.ts b/packages/app/e2e/workspace-model-restart.spec.ts
index 2952340941..3f459bf463 100644
--- a/packages/app/e2e/workspace-model-restart.spec.ts
+++ b/packages/app/e2e/workspace-model-restart.spec.ts
@@ -20,7 +20,7 @@ import {
 import { waitForSidebarHydration } from "./helpers/workspace-ui";
 import { getVisibleWorkspaceAgentTabIds } from "./helpers/workspace-tabs";
 
-const LEGACY_AGENT_ID = "legacy-cwd-only-agent";
+const LEGACY_AGENT_ID = "10000000-0000-4000-8000-000000000001";
 const SERVER_ID = `srv_restart_${randomUUID().replace(/-/g, "").slice(0, 16)}`;
 
 interface RestartDaemonClient {