diff --git a/apps/server/vitest.config.ts b/apps/server/vitest.config.ts
index e56e764c..36577c5e 100644
--- a/apps/server/vitest.config.ts
+++ b/apps/server/vitest.config.ts
@@ -3,6 +3,7 @@ import path from 'path';
 
 export default defineConfig({
   test: {
+    name: 'server',
     reporters: ['verbose'],
     globals: true,
     environment: 'node',
diff --git a/libs/dependency-resolver/vitest.config.ts b/libs/dependency-resolver/vitest.config.ts
index 605e3206..5ea8d7ee 100644
--- a/libs/dependency-resolver/vitest.config.ts
+++ b/libs/dependency-resolver/vitest.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   test: {
+    name: 'dependency-resolver',
     globals: true,
     environment: 'node',
     include: ['tests/**/*.test.ts'],
diff --git a/libs/git-utils/vitest.config.ts b/libs/git-utils/vitest.config.ts
index d3fe6f85..a1663bab 100644
--- a/libs/git-utils/vitest.config.ts
+++ b/libs/git-utils/vitest.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   test: {
+    name: 'git-utils',
     globals: true,
     environment: 'node',
     include: ['tests/**/*.test.ts'],
diff --git a/libs/model-resolver/vitest.config.ts b/libs/model-resolver/vitest.config.ts
index 0b83cc4e..1ff65363 100644
--- a/libs/model-resolver/vitest.config.ts
+++ b/libs/model-resolver/vitest.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   test: {
+    name: 'model-resolver',
     globals: true,
     environment: 'node',
     include: ['tests/**/*.test.ts'],
diff --git a/libs/platform/vitest.config.ts b/libs/platform/vitest.config.ts
index 08b2f10c..c0e0b91f 100644
--- a/libs/platform/vitest.config.ts
+++ b/libs/platform/vitest.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   test: {
+    name: 'platform',
     globals: true,
     environment: 'node',
     include: ['tests/**/*.test.ts'],
diff --git a/libs/prompts/vitest.config.ts b/libs/prompts/vitest.config.ts
index 01a9d58d..d61b462a 100644
--- a/libs/prompts/vitest.config.ts
+++ b/libs/prompts/vitest.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   test: {
+    name: 'prompts',
     globals: true,
     environment: 'node',
     include: ['tests/**/*.test.ts'],
diff --git a/libs/utils/vitest.config.ts b/libs/utils/vitest.config.ts
index bda40f56..b281170b 100644
--- a/libs/utils/vitest.config.ts
+++ b/libs/utils/vitest.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   test: {
+    name: 'utils',
     globals: true,
     environment: 'node',
     include: ['tests/**/*.test.ts'],
diff --git a/package.json b/package.json
index 7772c924..e42ac727 100644
--- a/package.json
+++ b/package.json
@@ -42,10 +42,12 @@
     "lint": "npm run lint --workspace=apps/ui",
     "test": "npm run test --workspace=apps/ui",
     "test:headed": "npm run test:headed --workspace=apps/ui",
-    "test:server": "npm run test --workspace=apps/server",
-    "test:server:coverage": "npm run test:cov --workspace=apps/server",
-    "test:packages": "npm run test -w @automaker/types -w @automaker/utils -w @automaker/prompts -w @automaker/platform -w @automaker/model-resolver -w @automaker/dependency-resolver -w @automaker/git-utils --if-present",
-    "test:all": "npm run test:packages && npm run test:server",
+    "test:packages": "vitest run --project=utils --project=platform --project=prompts --project=model-resolver --project=dependency-resolver --project=git-utils",
+    "test:server": "vitest run --project=server",
+    "test:server:coverage": "vitest run --project=server --coverage",
+    "test:unit": "vitest run",
+    "test:unit:watch": "vitest",
+    "test:all": "vitest run",
     "lint:lockfile": "node scripts/lint-lockfile.mjs",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
@@ -64,6 +66,7 @@
   "devDependencies": {
     "husky": "9.1.7",
     "lint-staged": "16.2.7",
-    "prettier": "3.7.4"
+    "prettier": "3.7.4",
+    "vitest": "4.0.16"
   }
 }
diff --git a/vitest.config.ts b/vitest.config.ts
new file mode 100644
index 00000000..80a64966
--- /dev/null
+++ b/vitest.config.ts
@@ -0,0 +1,16 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    // Use projects instead of deprecated workspace
+    projects: [
+      'libs/utils',
+      'libs/platform',
+      'libs/prompts',
+      'libs/model-resolver',
+      'libs/dependency-resolver',
+      'libs/git-utils',
+      'apps/server',
+    ],
+  },
+});