diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1056b52..5901161 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -40,12 +40,5 @@ jobs:
 
     - name: Install dependencies
       run: pnpm install --frozen-lockfile
-    - name: Run Linters
-      working-directory: ./@kindspells/astro-shield
-      run: pnpm lint
-    - name: Run Unit Tests
-      working-directory: ./@kindspells/astro-shield
-      run: pnpm test:unit:cov
-    # Disabled until we discover how to run "network-related" tests in CI
-    # - name: Run End-to-End Tests
-    #   run: pnpm test:e2e:coverage
+    - name: Run Moon CI checks
+      run: pnpm moon ci
diff --git a/.hooks/pre-commit b/.hooks/pre-commit
index 10a0ed1..3d55d62 100755
--- a/.hooks/pre-commit
+++ b/.hooks/pre-commit
@@ -7,5 +7,4 @@
 set -eu
 set -o pipefail
 
-pnpm moon :lint
-pnpm moon :test.unit.cov
+pnpm moon ci
diff --git a/.moon/workspace.yml b/.moon/workspace.yml
index 07a9f2c..8491a48 100644
--- a/.moon/workspace.yml
+++ b/.moon/workspace.yml
@@ -13,3 +13,6 @@ projects:
     - '@kindspells/astro-shield/e2e/fixtures/*'
   sources:
     astro-shield: '@kindspells/astro-shield'
+
+vcs:
+  defaultBranch: 'main'
diff --git a/@kindspells/astro-shield/moon.yml b/@kindspells/astro-shield/moon.yml
index e37873e..7ff927b 100644
--- a/@kindspells/astro-shield/moon.yml
+++ b/@kindspells/astro-shield/moon.yml
@@ -34,18 +34,22 @@ tasks:
       - 'e2e/**/*.mts'
   test.e2e:
     command: 'vitest -c vitest.config.e2e.mts run'
-    local: true
     inputs:
       - 'vitest.config.e2e.mts'
       - 'src/**/*'
       - 'e2e/**/*'
+    local: true
+    options:
+      runInCI: false
   test.unit:
     command: 'vitest -c vitest.config.unit.mts run'
-    local: true
     inputs:
       - 'vitest.config.unit.mts'
       - 'src/**/*'
       - 'tests/**/*'
+    local: true
+    options:
+      runInCI: false
   test.unit.cov:
     command: 'vitest -c vitest.config.unit.mts run --coverage'
     inputs:
diff --git a/@kindspells/astro-shield/package.json b/@kindspells/astro-shield/package.json
index 90ab6a7..4cf351c 100644
--- a/@kindspells/astro-shield/package.json
+++ b/@kindspells/astro-shield/package.json
@@ -31,7 +31,7 @@
 		"lint:biome": "moon run lint.biome",
 		"lint:publint": "moon run lint.publint",
 		"lint:tsc": "moon run lint.tsc",
-		"prepublishOnly": "pnpm lint && pnpm test:unit",
+		"prepublishOnly": "pnpm lint && pnpm test:unit:cov",
 		"test:e2e": "moon run test.e2e",
 		"test:unit": "moon run test.unit",
 		"test:unit:cov": "moon run test.unit.cov"