diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 75c3d99ee..dfe2f2cc5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,8 +14,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ["15.4", "15.2"]
+        xcode: ["16.1", "15.4", "15.2"]
         include:
+          - xcode: "16.1"
+            macos: macOS-14
           - xcode: "15.4"
             macos: macOS-14
           - xcode: "15.2"
@@ -52,8 +54,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swift: ["5.10", "5.9"]
+        swift: ["6.0-nightly", "5.10", "5.9"]
         include:
+          - swift: "6.0-nightly"
+            container: "swiftlang/swift:nightly-6.0-jammy"
+            cache-version: 1
           - swift: "5.10"
             container: "swift:5.10"
             cache-version: 1