diff --git a/src/services/code-index/__tests__/config-manager.spec.ts b/src/services/code-index/__tests__/config-manager.spec.ts
index 34581e6339..c0bd7ec1dd 100644
--- a/src/services/code-index/__tests__/config-manager.spec.ts
+++ b/src/services/code-index/__tests__/config-manager.spec.ts
@@ -1543,6 +1543,13 @@ describe("CodeIndexConfigManager", () => {
 	})
 
 	describe("loadConfiguration", () => {
+		beforeEach(() => {
+			// Set default mock behaviors
+			mockedGetDefaultModelId.mockReturnValue("text-embedding-3-small")
+			mockedGetModelDimension.mockReturnValue(undefined)
+			mockedGetModelScoreThreshold.mockReturnValue(undefined)
+		})
+
 		it("should persist and load OpenRouter embedder base URL correctly", async () => {
 			const mockGlobalState = {
 				codebaseIndexEnabled: true,
@@ -1654,12 +1661,6 @@ describe("CodeIndexConfigManager", () => {
 			const result = await configManager.loadConfiguration()
 			expect(result.requiresRestart).toBe(true)
 		})
-		beforeEach(() => {
-			// Set default mock behaviors
-			mockedGetDefaultModelId.mockReturnValue("text-embedding-3-small")
-			mockedGetModelDimension.mockReturnValue(undefined)
-			mockedGetModelScoreThreshold.mockReturnValue(undefined)
-		})
 
 		it("should load configuration and return proper structure", async () => {
 			const mockConfigValues = {
diff --git a/src/services/code-index/__tests__/orchestrator.spec.ts b/src/services/code-index/__tests__/orchestrator.spec.ts
index 392cf58958..b7b478c43e 100644
--- a/src/services/code-index/__tests__/orchestrator.spec.ts
+++ b/src/services/code-index/__tests__/orchestrator.spec.ts
@@ -155,6 +155,7 @@ describe("CodeIndexOrchestrator - error path cleanup gating", () => {
 						openRouterBaseUrl: testBaseUrl,
 					},
 				}),
+				// Use a valid EmbedderProvider value
 			}
 
 			const { CodeIndexServiceFactory } = await import("../service-factory")
@@ -196,12 +197,13 @@ describe("CodeIndexOrchestrator - error path cleanup gating", () => {
 			const prev = {
 				enabled: true,
 				configured: true,
-				embedderProvider: "openrouter",
+				embedderProvider: "openrouter" as import("../interfaces/manager").EmbedderProvider,
 				openRouterApiKey: "test-api-key",
 				openRouterBaseUrl: "https://old.openrouter.ai/api/v1",
 			}
 			const configManagerModule = await import("../config-manager")
-			const mgr = new configManagerModule.CodeIndexConfigManager({
+			// Provide a full ContextProxy mock with required properties/methods
+			const mockContextProxy = {
 				getGlobalState: vi.fn().mockReturnValue({
 					codebaseIndexEnabled: true,
 					codebaseIndexEmbedderProvider: "openrouter",
@@ -209,8 +211,14 @@ describe("CodeIndexOrchestrator - error path cleanup gating", () => {
 				}),
 				getSecret: vi.fn().mockReturnValue("test-api-key"),
 				refreshSecrets: vi.fn(),
-			})
-			mgr._loadAndSetConfiguration()
+				setValue: vi.fn(),
+				setValues: vi.fn(),
+				getValue: vi.fn(),
+				getProviderSettings: vi.fn().mockReturnValue({}),
+				setProviderSettings: vi.fn(),
+			}
+			const mgr = new configManagerModule.CodeIndexConfigManager(mockContextProxy)
+			await mgr.loadConfiguration()
 			const requiresRestart = mgr.doesConfigChangeRequireRestart(prev)
 			expect(requiresRestart).toBe(true)
 		})