diff --git a/packages/kit/package.json b/packages/kit/package.json
index 8aa270c68b4e..1ce2d1224551 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -60,30 +60,16 @@
 		"build": "rollup -c && node scripts/cp.js src/runtime/components assets/components && npm run types",
 		"dev": "rollup -cw",
 		"lint": "eslint --ignore-path .gitignore --ignore-pattern \"src/packaging/test/**\" \"{src,test}/**/*.{ts,mjs,js,svelte}\" && npm run check-format",
-		"check": "tsc && npm run check:integration && npm run check:prerendering",
-		"check:integration": "npm run check:integration:amp && npm run check:integration:basics && npm run check:integration:options && npm run check:integration:options-2",
-		"check:integration:amp": "cd test/apps/amp && pnpm sync && pnpm check",
-		"check:integration:basics": "cd test/apps/basics && pnpm sync && pnpm check",
-		"check:integration:options": "cd test/apps/options && pnpm sync && pnpm check",
-		"check:integration:options-2": "cd test/apps/options-2 && pnpm sync && pnpm check",
-		"check:prerendering": "npm run check:prerendering:basics && npm run check:prerendering:options",
-		"check:prerendering:basics": "cd test/prerendering/basics && pnpm sync && pnpm check",
-		"check:prerendering:options": "cd test/prerendering/options && pnpm sync && pnpm check",
+		"check": "tsc",
+		"check:all": "tsc && pnpm run -r check --filter ./",
 		"format": "npm run check-format -- --write",
 		"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
 		"prepublishOnly": "npm run build",
-		"test": "npm run test:unit && npm run test:typings && npm run test:packaging && npm run test:prerendering && npm run test:integration",
+		"test": "npm run test:unit && npm run test:typings && npm run test:packaging",
+		"test:all": "pnpm run -r test --workspace-concurrency 1 --filter ./",
 		"test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging",
 		"test:typings": "tsc --project test/typings",
-		"test:prerendering": "pnpm test:prerendering:basics && pnpm test:prerendering:options",
-		"test:prerendering:basics": "cd test/prerendering/basics && pnpm test",
-		"test:prerendering:options": "cd test/prerendering/options && pnpm test",
 		"test:packaging": "uvu src/packaging \"(spec\\.js|test[\\\\/]index\\.js)\"",
-		"test:integration": "pnpm test:integration:amp && pnpm test:integration:basics && pnpm test:integration:options && pnpm test:integration:options-2",
-		"test:integration:amp": "cd test/apps/amp && pnpm test",
-		"test:integration:basics": "cd test/apps/basics && pnpm test",
-		"test:integration:options": "cd test/apps/options && pnpm test",
-		"test:integration:options-2": "cd test/apps/options-2 && pnpm test",
 		"types": "node scripts/extract-types.js"
 	},
 	"exports": {
diff --git a/packages/kit/test/utils.js b/packages/kit/test/utils.js
index 84ca7cfb020f..f76049b28293 100644
--- a/packages/kit/test/utils.js
+++ b/packages/kit/test/utils.js
@@ -169,7 +169,8 @@ export const config = {
 	use: {
 		screenshot: 'only-on-failure',
 		trace: 'retain-on-failure'
-	}
+	},
+	workers: process.env.CI ? 2 : undefined
 };
 
 /**