@@ -1,7 +1,7 @@
 import { defineConfig, devices } from '@playwright/test';
 
 export default defineConfig({
-	testDir: './e2e',
+	testDir: './tests/e2e',
 	fullyParallel: false,
 	forbidOnly: !!process.env.CI,
 	retries: process.env.CI ? 2 : 0,
 
@@ -43,7 +43,15 @@
 				}
 			}
 		},
-		"test:mcp": {
+		"test:unit": {
+			"executor": "@nx/vite:test",
+			"outputs": ["{workspaceRoot}/coverage/packages/playground/mcp"],
+			"options": {
+				"passWithNoTests": true,
+				"reportsDirectory": "../../../coverage/packages/playground/mcp"
+			}
+		},
+		"test:e2e": {
 			"executor": "nx:run-commands",
 			"options": {
 				"commands": [
@@ -56,6 +64,10 @@
 				"parallel": false
 			}
 		},
+		"test:mcp": {
+			"executor": "nx:noop",
+			"dependsOn": ["test:unit", "test:e2e"]
+		},
 		"package-for-self-hosting": {
 			"executor": "@wp-playground/nx-extensions:package-for-self-hosting",
 			"dependsOn": ["build"]
 
@@ -29,8 +29,8 @@ const test = base.extend<McpTestFixtures, McpWorkerFixtures>({
 					'--experimental-strip-types',
 					'--experimental-transform-types',
 					'--import',
-					'../../../meta/src/node-es-module-loader/register.mts',
-					'../src/index.ts',
+					'../../../../meta/src/node-es-module-loader/register.mts',
+					'../../src/index.ts',
 					`--port=${MCP_WS_PORT}`,
 				],
 				cwd: dirname(fileURLToPath(import.meta.url)),
 
@@ -1,6 +1,6 @@
 import { describe, it, expect, afterEach } from 'vitest';
 import WebSocket from 'ws';
-import { PlaygroundBridge } from './bridge-server';
+import { PlaygroundBridge } from '../../src/bridge-server';
 
 // Use high random port to avoid conflicts
 const getPort = () => 19000 + Math.floor(Math.random() * 1000);
 
@@ -11,5 +11,8 @@
 	},
 	"files": [],
 	"include": [],
-	"references": [{ "path": "./tsconfig.lib.json" }]
+	"references": [
+		{ "path": "./tsconfig.lib.json" },
+		{ "path": "./tsconfig.spec.json" }
+	]
 }
@@ -0,0 +1,13 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"outDir": "../../../dist/out-tsc",
+		"types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"]
+	},
+	"include": [
+		"vite.config.ts",
+		"tests/**/*.spec.ts",
+		"tests/**/*.test.ts",
+		"src/**/*.d.ts"
+	]
+}
@@ -1,3 +1,4 @@
+/// <reference types="vitest" />
 import { defineConfig } from 'vite';
 
 import dts from 'vite-plugin-dts';
@@ -46,4 +47,16 @@ export default defineConfig({
 			},
 		},
 	},
+
+	test: {
+		globals: true,
+		cache: {
+			dir: '../../../node_modules/.vitest',
+		},
+		environment: 'node',
+		include: [
+			'tests/unit/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
+		],
+		reporters: ['default'],
+	},
 });