diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 3c9302afbc..5c6d344a1b 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   main:
     name: Run end-to-end tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     services:
       postgres:
         image: postgres:12.1-alpine
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f36c3200eb..d61aae167f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   test:
     name: Run tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     services:
       postgres:
         image: postgres:12.1-alpine
diff --git a/package.json b/package.json
index 37438a75a3..aaa8b1db88 100644
--- a/package.json
+++ b/package.json
@@ -21,8 +21,8 @@
     "release:publish": "pnpm install && pnpm build && changeset publish",
     "release:version": "changeset version && pnpm install --lockfile-only && pnpx bun@0.7.3 scripts/changelog.ts",
     "sort-package-json": "npx sort-package-json package.json 'packages/*/package.json' 'templates/*/package.json' 'templates/*/packages/*/package.json' 'examples/*/package.json' 'examples/*/packages/*/package.json' 'e2e/*/package.json' 'e2e/*/packages/*/package.json' 'docs/package.json'",
-    "test": "pnpm recursive run test",
-    "test:ci": "pnpm recursive run test:ci"
+    "test": "pnpm run --recursive --filter=!@latticexyz/services test",
+    "test:ci": "pnpm run --recursive --parallel --filter=!@latticexyz/services test:ci"
   },
   "lint-staged": {
     "*.{ts,tsx}": "eslint --cache --fix",