diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4b5d8c8b3..72cfee2cd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,27 +16,26 @@ jobs:
     continue-on-error: ${{ matrix.edgedb-version == 'nightly' }}
     strategy:
       matrix:
-        node-version: ["18", "20", "22"]
+        node-version: ["18", "20", "22", "23"]
         os: [ubuntu-latest]
         edgedb-version: ["stable"]
         include:
+          # Nightly server
           - os: ubuntu-latest
-            node-version: "20"
+            node-version: "22"
             edgedb-version: "nightly"
+          # Upcoming server
           - os: ubuntu-latest
-            node-version: "20"
-            edgedb-version: "5"
+            node-version: "22"
+            edgedb-version: "6.0-beta.2"
+          # LTS server
           - os: ubuntu-latest
-            node-version: "20"
+            node-version: "22"
             edgedb-version: "4"
-          # - os: ubuntu-latest
-          #   node-version: "20"
-          #   edgedb-version: "3"
-          # XXX: macOS is currently unsupported by setup-edgedb
-          # - os: macos-latest
-          #   node-version: "20"
-          #   edgedb-version: "stable"
-
+          # macOS
+          - os: macos-latest
+            node-version: "22"
+            edgedb-version: "stable"
     steps:
       - uses: actions/checkout@v4
         with: