diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7cea4816..fd081ae9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,13 +14,33 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  macos:
-    name: macOS
+  macos-15:
+    name: macOS 15
+    runs-on: macos-15
+    strategy:
+      matrix:
+        config: ['debug', 'release']
+        xcode: ['16.0']
+    steps:
+      - uses: actions/checkout@v4
+      - name: Select Xcode ${{ matrix.xcode }}
+        run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
+      - name: Skip macro validation
+        run: defaults write com.apple.dt.Xcode IDESkipMacroFingerprintValidation -bool YES
+      - name: Run tests
+        run: make test-swift
+      - name: Build platforms ${{ matrix.config }}
+        run: CONFIG=${{ matrix.config }} make build-all-platforms
+      - name: Build for library evolution
+        run: make build-for-library-evolution
+
+  macos-14:
+    name: macOS 14
     runs-on: macos-14
     strategy:
       matrix:
         config: ['debug', 'release']
-        xcode: ['15.4', '16.0']
+        xcode: ['15.4']
     steps:
       - uses: actions/checkout@v4
       - name: Select Xcode ${{ matrix.xcode }}
diff --git a/Makefile b/Makefile
index 8a76ba11..827e6cd3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 CONFIG = debug
-PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS 17,iPhone \d\+ Pro [^M])
+PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS,iPhone \d\+ Pro [^M])
 PLATFORM_MACOS = macOS
 PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
-PLATFORM_TVOS = tvOS Simulator,id=$(call udid_for,tvOS 17,TV)
-PLATFORM_WATCHOS = watchOS Simulator,id=$(call udid_for,watchOS 10,Watch)
+PLATFORM_TVOS = tvOS Simulator,id=$(call udid_for,tvOS,TV)
+PLATFORM_WATCHOS = watchOS Simulator,id=$(call udid_for,watchOS,Watch)
 
 default: test