diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a3781e3..7cbdada 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,6 +21,17 @@ jobs:
         env:
           CI: true
 
+      - name: Wait for Vite server
+        run: |
+          for i in {1..10}; do
+            if curl -s http://localhost:5173/retroleaderboards/; then
+              echo "Vite server is up!"
+              break
+            fi
+            echo "Waiting for Vite server..."
+            sleep 2
+          done
+
       - name: Run Cypress tests
         uses: cypress-io/github-action@v6
         with:
diff --git a/cypress.config.ts b/cypress.config.ts
index e097ea8..127f253 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -3,8 +3,6 @@ import { defineConfig } from "cypress";
 export default defineConfig({
   e2e: {
     baseUrl: 'http://localhost:5173/retroleaderboards',
-    setupNodeEvents(on, config) {
-      // implement node event listeners here
-    },
+    defaultCommandTimeout: 10000,
   },
 });