diff --git a/playwright.config.ts b/playwright.config.ts
index 068c6582e3..a4453b323b 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -28,9 +28,10 @@ const config: PlaywrightTestConfig = {
   workers: '100%',
 
   webServer: {
-    command: 'npm run dev',
+    command: 'pnpm build && pnpm start -p 8080',
     port: 8080,
-    reuseExistingServer: true,
+    timeout: 120 * 1000,
+    reuseExistingServer: !process.env.CI,
   },
 };