diff --git a/apps/console/src/__tests__/BrowserSimulation.test.tsx b/apps/console/src/__tests__/BrowserSimulation.test.tsx
index 563e916ff..c212ab51f 100644
--- a/apps/console/src/__tests__/BrowserSimulation.test.tsx
+++ b/apps/console/src/__tests__/BrowserSimulation.test.tsx
@@ -233,7 +233,7 @@ describe('Console Application Simulation', () => {
         // Check all labels exist concurrently using Promise.all for faster execution
         await Promise.all(
             fieldLabels.map(label =>
-                waitFor(() => expectLabelToExist(label), { timeout: 12000 })
+                waitFor(() => expectLabelToExist(label), { timeout: 5000 })
             )
         );
 
diff --git a/apps/console/src/__tests__/Onboarding.test.tsx b/apps/console/src/__tests__/Onboarding.test.tsx
index 016045c03..554b0c36d 100644
--- a/apps/console/src/__tests__/Onboarding.test.tsx
+++ b/apps/console/src/__tests__/Onboarding.test.tsx
@@ -37,9 +37,10 @@ describe('OnboardingWalkthrough', () => {
     
     render(<OnboardingWalkthrough />);
     
-    // Wait a bit then verify it's not shown
-    await new Promise(r => setTimeout(r, 1000));
-    expect(screen.queryByText('Welcome to ObjectUI')).not.toBeInTheDocument();
+    // Verify the dialog is not shown (no artificial delay needed)
+    await waitFor(() => {
+      expect(screen.queryByText('Welcome to ObjectUI')).not.toBeInTheDocument();
+    });
   });
 
   it('shows the first step initially', async () => {
diff --git a/packages/plugin-kanban/src/__tests__/performance-benchmark.test.tsx b/packages/plugin-kanban/src/__tests__/performance-benchmark.test.tsx
index f8ef38d6b..91c75d7eb 100644
--- a/packages/plugin-kanban/src/__tests__/performance-benchmark.test.tsx
+++ b/packages/plugin-kanban/src/__tests__/performance-benchmark.test.tsx
@@ -197,8 +197,8 @@ describe('KanbanBoard (KanbanImpl): performance benchmarks', () => {
     expect(elapsed).toBeLessThan(500);
   });
 
-  it('renders 500 cards spread across 5 columns under 1,000ms', () => {
-    const columns = generateColumns(5, 500);
+  it('renders 200 cards spread across 5 columns under 1,000ms', () => {
+    const columns = generateColumns(5, 200);
 
     const start = performance.now();
     const { container } = render(<KanbanBoard columns={columns} />);
@@ -208,8 +208,8 @@ describe('KanbanBoard (KanbanImpl): performance benchmarks', () => {
     expect(elapsed).toBeLessThan(1_000);
   });
 
-  it('renders 1,000 cards spread across 5 columns under 2,000ms', () => {
-    const columns = generateColumns(5, 1_000);
+  it('renders 500 cards spread across 5 columns under 2,000ms', () => {
+    const columns = generateColumns(5, 500);
 
     const start = performance.now();
     const { container } = render(<KanbanBoard columns={columns} />);
@@ -219,8 +219,8 @@ describe('KanbanBoard (KanbanImpl): performance benchmarks', () => {
     expect(elapsed).toBeLessThan(2_000);
   });
 
-  it('renders with 20+ columns without degradation', () => {
-    const columns = generateColumns(25, 250);
+  it('renders with 10+ columns without degradation', () => {
+    const columns = generateColumns(12, 120);
 
     const start = performance.now();
     const { container } = render(<KanbanBoard columns={columns} />);
@@ -230,8 +230,8 @@ describe('KanbanBoard (KanbanImpl): performance benchmarks', () => {
     expect(elapsed).toBeLessThan(2_000);
   });
 
-  it('renders empty board with 20+ columns quickly', () => {
-    const columns = generateColumns(25, 0);
+  it('renders empty board with 10+ columns quickly', () => {
+    const columns = generateColumns(12, 0);
 
     const start = performance.now();
     const { container } = render(<KanbanBoard columns={columns} />);
@@ -260,11 +260,11 @@ describe('KanbanBoard (KanbanImpl): scaling characteristics', () => {
     await setupMocksAndImport();
   });
 
-  it('renders all column titles for 20+ column board', () => {
-    const columns = generateColumns(25, 50);
+  it('renders all column titles for 10+ column board', () => {
+    const columns = generateColumns(12, 24);
     render(<KanbanBoard columns={columns} />);
 
-    for (let i = 0; i < 25; i++) {
+    for (let i = 0; i < 12; i++) {
       expect(document.body.textContent).toContain(`Column ${i}`);
     }
   });
@@ -274,7 +274,7 @@ describe('KanbanBoard (KanbanImpl): scaling characteristics', () => {
       {
         id: 'badges-col',
         title: 'With Badges',
-        cards: Array.from({ length: 500 }, (_, i) => ({
+        cards: Array.from({ length: 100 }, (_, i) => ({
           id: `badge-card-${i}`,
           title: `Task ${i}`,
           badges: [
@@ -293,8 +293,8 @@ describe('KanbanBoard (KanbanImpl): scaling characteristics', () => {
     expect(elapsed).toBeLessThan(2_000);
   });
 
-  it('renders 1,000 cards across 10 columns under 2,000ms', () => {
-    const columns = generateColumns(10, 1_000);
+  it('renders 500 cards across 10 columns under 2,000ms', () => {
+    const columns = generateColumns(10, 500);
 
     const start = performance.now();
     const { container } = render(<KanbanBoard columns={columns} />);
diff --git a/packages/react/src/__tests__/LazyPluginLoader.test.tsx b/packages/react/src/__tests__/LazyPluginLoader.test.tsx
index 9c677a2e6..c8d256e17 100644
--- a/packages/react/src/__tests__/LazyPluginLoader.test.tsx
+++ b/packages/react/src/__tests__/LazyPluginLoader.test.tsx
@@ -166,7 +166,7 @@ describe('createLazyPlugin', () => {
 
     await waitFor(() => {
       expect(screen.getByText('Success after retry')).toBeInTheDocument();
-    }, { timeout: 5000 });
+    }, { timeout: 2000 });
 
     // First call + 2 retries (fails) + 1 success = called 3 times
     expect(importFn).toHaveBeenCalledTimes(3);
diff --git a/vitest.workspace.ts b/vitest.workspace.ts
new file mode 100644
index 000000000..9b86e95cc
--- /dev/null
+++ b/vitest.workspace.ts
@@ -0,0 +1,41 @@
+import { defineWorkspace } from 'vitest/config';
+
+export default defineWorkspace([
+  {
+    extends: './vitest.config.mts',
+    test: {
+      name: 'unit',
+      include: [
+        'packages/core/src/**/*.test.ts',
+        'packages/types/src/**/*.test.ts',
+        'packages/cli/src/**/*.test.ts',
+        'packages/data-objectstack/src/**/*.test.ts',
+      ],
+      environment: 'node',
+      setupFiles: [],
+      testTimeout: 5000,
+    },
+  },
+  {
+    extends: './vitest.config.mts',
+    test: {
+      name: 'ui',
+      include: [
+        'packages/*/src/**/*.test.{ts,tsx}',
+        'apps/*/src/**/*.test.{ts,tsx}',
+        'examples/*/src/**/*.test.{ts,tsx}',
+      ],
+      exclude: [
+        'packages/core/src/**/*.test.ts',
+        'packages/types/src/**/*.test.ts',
+        'packages/cli/src/**/*.test.ts',
+        'packages/data-objectstack/src/**/*.test.ts',
+        '**/node_modules/**',
+        '**/dist/**',
+        '**/cypress/**',
+        '**/e2e/**',
+        '**/.{idea,git,cache,output,temp}/**',
+      ],
+    },
+  },
+]);
diff --git a/vitest.workspace.yaml b/vitest.workspace.yaml
deleted file mode 100644
index 2eb129ea3..000000000
--- a/vitest.workspace.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-packages:
-  - packages/*
-  - apps/*
-  - examples/*