diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f4a1820..f046cd4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,9 +21,41 @@ permissions:
 jobs:
   lint:
     name: Lint
-    uses: ./.github/workflows/lint.yml
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Biome
+        uses: biomejs/setup-biome@v2
+        
+      - name: Lint
+        run: biome ci --no-errors-on-unmatched .
 
   test:
     name: Test
-    uses: ./.github/workflows/test.yml
-    secrets: inherit
\ No newline at end of file
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup and Install
+        id: install
+        uses: ./.github/actions/setup-and-install
+        with:
+          node-version: 20
+
+      - name: Start LocalStack
+        uses: LocalStack/setup-localstack@v0.2.2
+        with:
+          image-tag: 'latest'
+          install-awslocal: 'true'
+
+      - name: Build
+        run: pnpm build
+
+      - name: Test
+        run: pnpm test
+
+      - name: Coverage
+        if: ${{ steps.install.conclusion == 'success' }}
+        uses: davelosert/vitest-coverage-report-action@v2
\ No newline at end of file
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
deleted file mode 100644
index 170ea12..0000000
--- a/.github/workflows/lint.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Lint
-
-on:
-  workflow_call:
-
-jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Biome
-        uses: biomejs/setup-biome@v2
-
-      - name: Lint
-        run: biome ci --no-errors-on-unmatched .
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 23df4b4..0000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Test
-
-on:
-  workflow_call:
-
-jobs:
-  test:
-    name: Unit
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup and Install
-        id: install
-        uses: ./.github/actions/setup-and-install
-        with:
-          node-version: 20
-
-      - name: Start LocalStack
-        uses: LocalStack/setup-localstack@v0.2.2
-        with:
-          image-tag: 'latest'
-          install-awslocal: 'true'
-
-      - name: Test
-        run: pnpm test
-
-      - name: Coverage
-        if: ${{ steps.install.conclusion == 'success' }}
-        uses: davelosert/vitest-coverage-report-action@v2
\ No newline at end of file
diff --git a/vitest.workspace.ts b/vitest.workspace.ts
index 586a328..3bc91b1 100644
--- a/vitest.workspace.ts
+++ b/vitest.workspace.ts
@@ -5,7 +5,7 @@ export default defineWorkspace([
 		test: {
 			name: "unit",
 			include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)"],
-			exclude: [...configDefaults.exclude, "tests"],
+			exclude: [...configDefaults.exclude, "**/tests/**"],
 
 			// https://vitest.dev/config/#typecheck
 			typecheck: {