diff --git a/src/agents/command/session.resolve-session-key.test.ts b/src/agents/command/session.resolve-session-key.test.ts
index 222957f98ac..106c9e28279 100644
--- a/src/agents/command/session.resolve-session-key.test.ts
+++ b/src/agents/command/session.resolve-session-key.test.ts
@@ -7,19 +7,19 @@ const hoisted = vi.hoisted(() => ({
   listAgentIdsMock: vi.fn<() => string[]>(),
 }));
 
-vi.mock("../../config/sessions.js", async () => {
-  const actual = await vi.importActual<typeof import("../../config/sessions.js")>(
-    "../../config/sessions.js",
-  );
-  return {
-    ...actual,
-    loadSessionStore: (storePath: string) => hoisted.loadSessionStoreMock(storePath),
-    resolveStorePath: (store?: string, params?: { agentId?: string }) =>
-      `/stores/${params?.agentId ?? "main"}.json`,
-    resolveAgentIdFromSessionKey: () => "main",
-    resolveExplicitAgentSessionKey: () => undefined,
-  };
-});
+vi.mock("../../config/sessions/store-load.js", () => ({
+  loadSessionStore: (storePath: string) => hoisted.loadSessionStoreMock(storePath),
+}));
+
+vi.mock("../../config/sessions/paths.js", () => ({
+  resolveStorePath: (_store?: string, params?: { agentId?: string }) =>
+    `/stores/${params?.agentId ?? "main"}.json`,
+}));
+
+vi.mock("../../config/sessions/main-session.js", () => ({
+  resolveAgentIdFromSessionKey: () => "main",
+  resolveExplicitAgentSessionKey: () => undefined,
+}));
 
 vi.mock("../agent-scope.js", () => ({
   listAgentIds: () => hoisted.listAgentIdsMock(),
diff --git a/src/agents/model-fallback.probe.test.ts b/src/agents/model-fallback.probe.test.ts
index 2fdee3ed0f2..59582c4f700 100644
--- a/src/agents/model-fallback.probe.test.ts
+++ b/src/agents/model-fallback.probe.test.ts
@@ -21,6 +21,10 @@ vi.mock("./auth-profiles/order.js", () => ({
   resolveAuthProfileOrder: vi.fn(),
 }));
 
+vi.mock("./auth-profiles/source-check.js", () => ({
+  hasAnyAuthProfileStoreSource: vi.fn(() => true),
+}));
+
 type AuthProfilesStoreModule = typeof import("./auth-profiles/store.js");
 type AuthProfilesUsageModule = typeof import("./auth-profiles/usage.js");
 type AuthProfilesOrderModule = typeof import("./auth-profiles/order.js");