diff --git a/apps/server/package.json b/apps/server/package.json
index 3a373c5c4..15bf1245a 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -14,6 +14,8 @@
     "lint": "biome check",
     "start": "bun dist/index.js",
     "test": "vitest run",
+    "test:unit": "vitest run --exclude '**/*.int.test.ts' --exclude '**/*.integration.test.ts'",
+    "test:integration": "vitest run --include '**/*.int.test.ts' --include '**/*.integration.test.ts'",
     "test:coverage": "vitest --coverage",
     "test:watch": "vitest --watch",
     "typecheck": "tsc --noEmit"
diff --git a/apps/trigger/package.json b/apps/trigger/package.json
index 1f5af7480..bf0ea6434 100644
--- a/apps/trigger/package.json
+++ b/apps/trigger/package.json
@@ -12,7 +12,7 @@
     "test": "vitest run",
     "test:watch": "vitest watch",
     "test:coverage": "vitest run --coverage",
-    "test:integration": "vitest run tests/integration",
+    "test:integration": "vitest run --include '**/*.int.test.ts' --include '**/*.integration.test.ts'",
     "test:integration:watch": "vitest watch tests/integration",
     "test:unit": "vitest run tests/unit",
     "typecheck": "tsc --noEmit"
diff --git a/packages/access-controls/package.json b/packages/access-controls/package.json
index dee2cbb24..c9a681596 100644
--- a/packages/access-controls/package.json
+++ b/packages/access-controls/package.json
@@ -20,6 +20,8 @@
     "dev": "tsc --watch",
     "lint": "biome check",
     "test": "vitest run",
+    "test:unit": "vitest run --exclude '**/*.int.test.ts' --exclude '**/*.integration.test.ts'",
+    "test:integration": "vitest run --include '**/*.int.test.ts' --include '**/*.integration.test.ts'",
     "test:coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "typecheck": "tsc --noEmit"
diff --git a/packages/ai/package.json b/packages/ai/package.json
index 2c743f085..bfed9158e 100644
--- a/packages/ai/package.json
+++ b/packages/ai/package.json
@@ -21,6 +21,8 @@
     "dev:mastra": "mastra dev --dir src",
     "lint": "biome check",
     "test": "vitest run",
+    "test:unit": "vitest run --exclude '**/*.int.test.ts' --exclude '**/*.integration.test.ts'",
+    "test:integration": "vitest run --include '**/*.int.test.ts' --include '**/*.integration.test.ts'",
     "test:watch": "vitest watch",
     "test:coverage": "vitest run --coverage",
     "eval:metrics": "npx braintrust eval evals/agents/analyst-agent/metrics",
diff --git a/packages/data-source/package.json b/packages/data-source/package.json
index 04e2cf39b..496a21017 100644
--- a/packages/data-source/package.json
+++ b/packages/data-source/package.json
@@ -21,7 +21,7 @@
     "lint:fix": "biome check --write",
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
-    "test:integration": "vitest run tests/integration/",
+    "test:integration": "vitest run --include '**/*.int.test.ts' --include '**/*.integration.test.ts'",
     "test:introspection": "vitest run tests/integration/data-source-introspection.test.ts",
     "test:unit": "vitest run tests/unit/",
     "test:watch": "vitest",
diff --git a/packages/database/package.json b/packages/database/package.json
index 44cc9cb65..fafdba141 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -40,6 +40,8 @@
     "lint": "biome check",
     "stop": "pnpm run db:stop",
     "test": "vitest run",
+    "test:unit": "vitest run --exclude '**/*.int.test.ts' --exclude '**/*.integration.test.ts'",
+    "test:integration": "vitest run --include '**/*.int.test.ts' --include '**/*.integration.test.ts'",
     "test:coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "typecheck": "tsc --noEmit"
diff --git a/packages/rerank/package.json b/packages/rerank/package.json
index f809abc22..3d056ac58 100644
--- a/packages/rerank/package.json
+++ b/packages/rerank/package.json
@@ -15,6 +15,8 @@
     "build": "tsc",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
+    "test:unit": "vitest run --exclude '**/*.int.test.ts' --exclude '**/*.integration.test.ts'",
+    "test:integration": "vitest run --include '**/*.int.test.ts' --include '**/*.integration.test.ts'",
     "test:watch": "vitest watch",
     "test:coverage": "vitest run --coverage",
     "lint": "biome check",
diff --git a/packages/server-shared/package.json b/packages/server-shared/package.json
index 5252ece4d..d7fa84fce 100644
--- a/packages/server-shared/package.json
+++ b/packages/server-shared/package.json
@@ -11,6 +11,8 @@
     "lint": "biome check",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
+    "test:unit": "vitest run --exclude '**/*.int.test.ts' --exclude '**/*.integration.test.ts'",
+    "test:integration": "vitest run --include '**/*.int.test.ts' --include '**/*.integration.test.ts'",
     "test:watch": "vitest"
   },
   "exports": {
diff --git a/packages/slack/package.json b/packages/slack/package.json
index 25d3eda0e..358ca5577 100644
--- a/packages/slack/package.json
+++ b/packages/slack/package.json
@@ -21,6 +21,7 @@
     "dev": "tsc --watch",
     "lint": "biome check",
     "test": "vitest run",
+    "test:unit": "vitest run --exclude '**/*.int.test.ts' --exclude '**/*.integration.test.ts'",
     "test:watch": "vitest watch",
     "test:coverage": "vitest run --coverage",
     "test:integration": "vitest run src/**/*.int.test.ts"
diff --git a/packages/stored-values/package.json b/packages/stored-values/package.json
index 4a2f8660b..7bf453bfc 100644
--- a/packages/stored-values/package.json
+++ b/packages/stored-values/package.json
@@ -25,6 +25,8 @@
     "build:commonjs:watch": "npm run build:commonjs && tsc --module commonjs --moduleResolution node --watch",
     "lint": "biome check",
     "test": "vitest run",
+    "test:unit": "vitest run --exclude '**/*.int.test.ts' --exclude '**/*.integration.test.ts'",
+    "test:integration": "vitest run --include '**/*.int.test.ts' --include '**/*.integration.test.ts'",
     "test:coverage": "vitest run --coverage",
     "test:watch": "vitest watch",
     "typecheck": "tsc --noEmit"
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index ae770fece..c2d88df23 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -19,6 +19,8 @@
     "typecheck": "tsc --noEmit",
     "lint": "biome check",
     "test": "vitest run",
+    "test:unit": "vitest run --exclude '**/*.int.test.ts' --exclude '**/*.integration.test.ts'",
+    "test:integration": "vitest run --include '**/*.int.test.ts' --include '**/*.integration.test.ts'",
     "test:watch": "vitest watch",
     "test:coverage": "vitest run --coverage"
   },
diff --git a/packages/web-tools/package.json b/packages/web-tools/package.json
index 60a379523..da54037a0 100644
--- a/packages/web-tools/package.json
+++ b/packages/web-tools/package.json
@@ -8,6 +8,8 @@
     "build": "tsc --build",
     "lint": "biome check",
     "test": "vitest run",
+    "test:unit": "vitest run --exclude '**/*.int.test.ts' --exclude '**/*.integration.test.ts'",
+    "test:integration": "vitest run --include '**/*.int.test.ts' --include '**/*.integration.test.ts'",
     "test:coverage": "vitest --coverage",
     "test:ui": "vitest --ui",
     "test:watch": "vitest",