diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b27bfaf..22ca053 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,10 +11,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+
       - name: Cypress run
         uses: cypress-io/github-action@v6
         with:
-          start: npm run develop -- --port 30000 # this will JIT-compile content, which current saves time vs a full build/serve of the site, since our test suite covers only a small portion of the finished files
-          wait-on: 'http://localhost:30000' # quote the url to be safe against YML parsing surprises
-          command: npm run test:cypress
-          config: pageLoadTimeout=100000,baseUrl=http://localhost:30000
+          start: npm run develop -- --port 3000 # this will JIT-compile content, which current saves time vs a full build/serve of the site, since our test suite covers only a small portion of the finished files
+          wait-on: 'http://localhost:3000' # quote the url to be safe against YML parsing surprises
+          config: pageLoadTimeout=15000,baseUrl=http://localhost:3000
diff --git a/package.json b/package.json
index df5e09f..1a7cd1f 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,8 @@
     "serve": "gatsby serve",
     "prestart": "npm run data:updateShows",
     "start": "gatsby develop",
-    "test": "start-server-and-test http://localhost:8000 test:cypress",
-    "test:cypress": "cypress run"
+    "test:serve": "start-server-and-test http://localhost:8000 'npm run test -- --config baseUrl=http://localhost:8000'",
+    "test": "cypress run"
   },
   "dependencies": {
     "gatsby": "5.13.7",