diff --git a/package-lock.json b/package-lock.json
index 44dec9c3..c41ea97d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14248,7 +14248,6 @@
         "winston": "^3.17.0"
       },
       "devDependencies": {
-        "@google/gemini-cli-test-utils": "file:../test-utils",
         "@types/express": "^5.0.3",
         "@types/fs-extra": "^11.0.4",
         "@types/supertest": "^6.0.3",
@@ -14814,9 +14813,7 @@
       "version": "0.2.1",
       "license": "Apache-2.0",
       "devDependencies": {
-        "@google/gemini-cli-core": "file:../core",
-        "typescript": "^5.3.3",
-        "vitest": "^3.1.1"
+        "typescript": "^5.3.3"
       },
       "engines": {
         "node": ">=20"
diff --git a/packages/a2a-server/package.json b/packages/a2a-server/package.json
index d8fcc05c..edbd64f1 100644
--- a/packages/a2a-server/package.json
+++ b/packages/a2a-server/package.json
@@ -34,7 +34,6 @@
   },
   "devDependencies": {
     "@types/express": "^5.0.3",
-    "@google/gemini-cli-test-utils": "file:../test-utils",
     "@types/fs-extra": "^11.0.4",
     "@types/supertest": "^6.0.3",
     "@types/tar": "^6.1.13",
diff --git a/packages/a2a-server/src/agent.test.ts b/packages/a2a-server/src/agent.test.ts
index a683b2ee..4c563179 100644
--- a/packages/a2a-server/src/agent.test.ts
+++ b/packages/a2a-server/src/agent.test.ts
@@ -33,7 +33,7 @@ import {
   assertTaskCreationAndWorkingStatus,
   createStreamMessageRequest,
 } from './testing_utils.js';
-import { MockTool } from '@google/gemini-cli-test-utils';
+import { MockTool } from '@google/gemini-cli-core';
 
 const mockToolConfirmationFn = async () =>
   ({}) as unknown as ToolCallConfirmationDetails;
diff --git a/packages/cli/src/ui/hooks/useToolScheduler.test.ts b/packages/cli/src/ui/hooks/useToolScheduler.test.ts
index e95d49a4..4584cfa3 100644
--- a/packages/cli/src/ui/hooks/useToolScheduler.test.ts
+++ b/packages/cli/src/ui/hooks/useToolScheduler.test.ts
@@ -25,10 +25,13 @@ import type {
   AnyDeclarativeTool,
   AnyToolInvocation,
 } from '@google/gemini-cli-core';
-import { ToolConfirmationOutcome, ApprovalMode } from '@google/gemini-cli-core';
+import {
+  ToolConfirmationOutcome,
+  ApprovalMode,
+  MockTool,
+} from '@google/gemini-cli-core';
 import type { HistoryItemWithoutId, HistoryItemToolGroup } from '../types.js';
 import { ToolCallStatus } from '../types.js';
-import { MockTool } from '@google/gemini-cli-test-utils';
 
 // Mocks
 vi.mock('@google/gemini-cli-core', async () => {
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 64732c21..c8a2dda1 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -106,3 +106,6 @@ export * from './telemetry/index.js';
 export { sessionId } from './utils/session.js';
 export * from './utils/browser.js';
 export { Storage } from './config/storage.js';
+
+// Export test utils
+export * from './test-utils/index.js';
diff --git a/packages/core/src/test-utils/index.ts b/packages/core/src/test-utils/index.ts
new file mode 100644
index 00000000..6146d39d
--- /dev/null
+++ b/packages/core/src/test-utils/index.ts
@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './mock-tool.js';
diff --git a/packages/test-utils/src/mock-tool.ts b/packages/core/src/test-utils/mock-tool.ts
similarity index 97%
rename from packages/test-utils/src/mock-tool.ts
rename to packages/core/src/test-utils/mock-tool.ts
index e1e0090a..5fb6a6d2 100644
--- a/packages/test-utils/src/mock-tool.ts
+++ b/packages/core/src/test-utils/mock-tool.ts
@@ -9,12 +9,12 @@ import type {
   ToolCallConfirmationDetails,
   ToolInvocation,
   ToolResult,
-} from '@google/gemini-cli-core';
+} from '../tools/tools.js';
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   Kind,
-} from '@google/gemini-cli-core';
+} from '../tools/tools.js';
 
 type MockToolOptions = {
   name: string;
diff --git a/packages/test-utils/index.ts b/packages/test-utils/index.ts
index 3e74d6be..d69ad168 100644
--- a/packages/test-utils/index.ts
+++ b/packages/test-utils/index.ts
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './src/index.js';
+export * from './src/file-system-test-helpers.js';
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index fd09763d..481f186c 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -10,9 +10,7 @@
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
-    "typescript": "^5.3.3",
-    "@google/gemini-cli-core": "file:../core",
-    "vitest": "^3.1.1"
+    "typescript": "^5.3.3"
   },
   "engines": {
     "node": ">=20"
diff --git a/packages/test-utils/src/index.ts b/packages/test-utils/src/index.ts
index 4c8efb2e..b8af8aa7 100644
--- a/packages/test-utils/src/index.ts
+++ b/packages/test-utils/src/index.ts
@@ -5,4 +5,3 @@
  */
 
 export * from './file-system-test-helpers.js';
-export * from './mock-tool.js';