diff --git a/clients/web/src/test/core/mcp/state/managedPromptsState.test.ts b/clients/web/src/test/core/mcp/state/managedPromptsState.test.ts
index d4f597d98..df38f3540 100644
--- a/clients/web/src/test/core/mcp/state/managedPromptsState.test.ts
+++ b/clients/web/src/test/core/mcp/state/managedPromptsState.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { describe, it, expect, beforeEach, vi } from "vitest";
 import type { Prompt } from "@modelcontextprotocol/sdk/types.js";
 import type { InspectorServerSettings } from "@inspector/core/mcp/types.js";
 import { ManagedPromptsState } from "@inspector/core/mcp/state/managedPromptsState";
@@ -84,10 +84,9 @@ describe("ManagedPromptsState", () => {
     const promptlessState = new ManagedPromptsState(promptless, 0);
 
     promptless.dispatchTypedEvent("connect");
-    // Yield so the async refresh chained off connect runs.
-    await Promise.resolve();
-    await Promise.resolve();
-    expect(promptless.listPrompts).not.toHaveBeenCalled();
+    await vi.waitFor(() => {
+      expect(promptless.listPrompts).not.toHaveBeenCalled();
+    });
     expect(promptlessState.getPrompts()).toEqual([]);
   });
 
diff --git a/clients/web/src/test/core/mcp/state/managedRequestorTasksState.test.ts b/clients/web/src/test/core/mcp/state/managedRequestorTasksState.test.ts
index bcc5e07dc..c5ac8921f 100644
--- a/clients/web/src/test/core/mcp/state/managedRequestorTasksState.test.ts
+++ b/clients/web/src/test/core/mcp/state/managedRequestorTasksState.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { describe, it, expect, beforeEach, vi } from "vitest";
 import type { Task } from "@modelcontextprotocol/sdk/types.js";
 import { ManagedRequestorTasksState } from "@inspector/core/mcp/state/managedRequestorTasksState";
 import { FakeInspectorClient } from "@inspector/core/mcp/__tests__/fakeInspectorClient";
@@ -74,10 +74,9 @@ describe("ManagedRequestorTasksState", () => {
     const tasklessState = new ManagedRequestorTasksState(taskless);
 
     taskless.dispatchTypedEvent("connect");
-    // Yield once so the async refresh chained off connect runs.
-    await Promise.resolve();
-    await Promise.resolve();
-    expect(taskless.listRequestorTasks).not.toHaveBeenCalled();
+    await vi.waitFor(() => {
+      expect(taskless.listRequestorTasks).not.toHaveBeenCalled();
+    });
     expect(tasklessState.getTasks()).toEqual([]);
   });
 
diff --git a/clients/web/src/test/core/mcp/state/managedResourceTemplatesState.test.ts b/clients/web/src/test/core/mcp/state/managedResourceTemplatesState.test.ts
index 41538af9f..6983a6993 100644
--- a/clients/web/src/test/core/mcp/state/managedResourceTemplatesState.test.ts
+++ b/clients/web/src/test/core/mcp/state/managedResourceTemplatesState.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { describe, it, expect, beforeEach, vi } from "vitest";
 import type { ResourceTemplate } from "@modelcontextprotocol/sdk/types.js";
 import type { InspectorServerSettings } from "@inspector/core/mcp/types.js";
 import { ManagedResourceTemplatesState } from "@inspector/core/mcp/state/managedResourceTemplatesState";
@@ -90,10 +90,9 @@ describe("ManagedResourceTemplatesState", () => {
     );
 
     resourceless.dispatchTypedEvent("connect");
-    // Yield so the async refresh chained off connect runs.
-    await Promise.resolve();
-    await Promise.resolve();
-    expect(resourceless.listResourceTemplates).not.toHaveBeenCalled();
+    await vi.waitFor(() => {
+      expect(resourceless.listResourceTemplates).not.toHaveBeenCalled();
+    });
     expect(resourcelessState.getResourceTemplates()).toEqual([]);
   });
 
diff --git a/clients/web/src/test/core/mcp/state/managedResourcesState.test.ts b/clients/web/src/test/core/mcp/state/managedResourcesState.test.ts
index 3a6119a87..fa06da03f 100644
--- a/clients/web/src/test/core/mcp/state/managedResourcesState.test.ts
+++ b/clients/web/src/test/core/mcp/state/managedResourcesState.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { describe, it, expect, beforeEach, vi } from "vitest";
 import type { Resource } from "@modelcontextprotocol/sdk/types.js";
 import type { InspectorServerSettings } from "@inspector/core/mcp/types.js";
 import { ManagedResourcesState } from "@inspector/core/mcp/state/managedResourcesState";
@@ -89,10 +89,9 @@ describe("ManagedResourcesState", () => {
     const resourcelessState = new ManagedResourcesState(resourceless, 0);
 
     resourceless.dispatchTypedEvent("connect");
-    // Yield so the async refresh chained off connect runs.
-    await Promise.resolve();
-    await Promise.resolve();
-    expect(resourceless.listResources).not.toHaveBeenCalled();
+    await vi.waitFor(() => {
+      expect(resourceless.listResources).not.toHaveBeenCalled();
+    });
     expect(resourcelessState.getResources()).toEqual([]);
   });
 
diff --git a/clients/web/src/test/core/mcp/state/managedToolsState.test.ts b/clients/web/src/test/core/mcp/state/managedToolsState.test.ts
index 73b5bed27..cf6a70cbe 100644
--- a/clients/web/src/test/core/mcp/state/managedToolsState.test.ts
+++ b/clients/web/src/test/core/mcp/state/managedToolsState.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { describe, it, expect, beforeEach, vi } from "vitest";
 import type { Tool } from "@modelcontextprotocol/sdk/types.js";
 import type { InspectorServerSettings } from "@inspector/core/mcp/types.js";
 import { ManagedToolsState } from "@inspector/core/mcp/state/managedToolsState";
@@ -84,10 +84,9 @@ describe("ManagedToolsState", () => {
     const toollessState = new ManagedToolsState(toolless, 0);
 
     toolless.dispatchTypedEvent("connect");
-    // Yield so the async refresh chained off connect runs.
-    await Promise.resolve();
-    await Promise.resolve();
-    expect(toolless.listTools).not.toHaveBeenCalled();
+    await vi.waitFor(() => {
+      expect(toolless.listTools).not.toHaveBeenCalled();
+    });
     expect(toollessState.getTools()).toEqual([]);
   });