diff --git a/.github/workflows/mac-m1.yml b/.github/workflows/mac-m1.yml
index a1c380d4f..93938f060 100644
--- a/.github/workflows/mac-m1.yml
+++ b/.github/workflows/mac-m1.yml
@@ -8,7 +8,7 @@ on:
     - main
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-14
     timeout-minutes: 20
     steps:
     - name: Harden Runner
@@ -40,10 +40,19 @@ jobs:
     #  run: system_profiler SPDisplaysDataType |grep Resolution
     - name: Enable Safaridriver
       run: sudo safaridriver --enable
-    #- name: Start local HTTP server
-    # run: (npm run start-server&)
+    - name: Start local HTTP server
+      run: (npm run start-server&)
+    - name: Safari environment diagnostics
+      run: |
+        sw_vers
+        echo "---"
+        /usr/bin/safaridriver --version
+        echo "---"
+        mdls -name kMDItemVersion /Applications/Safari.app || true
+        echo "---"
+        pgrep -lf safaridriver || echo "no safaridriver process"
     - name: Test Safari without video
-      run: ./bin/browsertime.js -b safari -n 1 https://www.sitespeed.io/
+      run: ./bin/browsertime.js -b safari -n 1 http://127.0.0.1:3000/simple/
     #- name: Test Safari with video and Visual Metrics
     #  run: ./bin/browsertime.js -b safari -n 1 --viewPort 800x600  --video --visualMetrics https://www.sitespeed.io/
     #- name: Test Safari iOS simulator
diff --git a/.github/workflows/safari.yml b/.github/workflows/safari.yml
index de277d619..682d06862 100644
--- a/.github/workflows/safari.yml
+++ b/.github/workflows/safari.yml
@@ -8,7 +8,7 @@ on:
     - main
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-14
     timeout-minutes: 20
     steps:
     - name: Harden Runner
@@ -44,12 +44,21 @@ jobs:
       run: ffmpeg -version
     - name: List all simulators
       run: xcrun xctrace list devices
-    #- name: Start local HTTP server
-    # run: (npm run start-server&)
+    - name: Start local HTTP server
+      run: (npm run start-server&)
+    - name: Safari environment diagnostics
+      run: |
+        sw_vers
+        echo "---"
+        /usr/bin/safaridriver --version
+        echo "---"
+        mdls -name kMDItemVersion /Applications/Safari.app || true
+        echo "---"
+        pgrep -lf safaridriver || echo "no safaridriver process"
     - name: Test Safari without video
-      run: ./bin/browsertime.js -b safari -n 1 https://www.sitespeed.io/
+      run: ./bin/browsertime.js -b safari -n 1 http://127.0.0.1:3000/simple/
     - name: Test Safari with video and Visual Metrics
-      run: ./bin/browsertime.js -b safari -n 1 --viewPort 800x600  --video --visualMetrics https://www.sitespeed.io/
+      run: ./bin/browsertime.js -b safari -n 1 --viewPort 800x600 --video --visualMetrics http://127.0.0.1:3000/simple/
     #- name: Test Safari iOS simulator
     #  run: |
     #    IPHONE14=$(xcrun xctrace list devices  2>&1  | grep -m 1 "iPhone 14 Simulator" | awk -F'[()]' '{print $4}')