diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
index 86e1f42a109..7570be9c9bd 100644
--- a/.github/workflows/database.yml
+++ b/.github/workflows/database.yml
@@ -53,6 +53,8 @@ jobs:
       run: scripts/setup_bundler.sh
     - name: Install xcpretty
       run: gem install xcpretty
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
     - name: IntegrationTest
       # Only iOS to mitigate flakes.
       run: scripts/third_party/travis/retry.sh scripts/build.sh Database iOS integration
diff --git a/.github/workflows/remoteconfig.yml b/.github/workflows/remoteconfig.yml
index 4fbf6aa191d..eb5cae871c7 100644
--- a/.github/workflows/remoteconfig.yml
+++ b/.github/workflows/remoteconfig.yml
@@ -118,27 +118,35 @@ jobs:
           - os: macos-13
             xcode: Xcode_15.2
             target: iOS
+            test: spm
           - os: macos-14
             xcode: Xcode_15.4
             target: iOS
+            test: spm
           - os: macos-15
             xcode: Xcode_16
             target: iOS
+            test: spm
           - os: macos-15
             xcode: Xcode_16
             target: tvOS
+            test: spm
           - os: macos-15
             xcode: Xcode_16
             target: macOS
+            test: spm
           - os: macos-15
             xcode: Xcode_16
             target: watchOS
+            test: spmbuildonly
           - os: macos-15
             xcode: Xcode_16
             target: catalyst
+            test: spm
           - os: macos-15
             xcode: Xcode_16
             target: visionOS
+            test: spm
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -153,7 +161,7 @@ jobs:
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh RemoteConfigUnit ${{ matrix.target }} spm
     - name: Fake Console tests
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh RemoteConfigFakeConsole ${{ matrix.target }} spm
+      run: scripts/third_party/travis/retry.sh ./scripts/build.sh RemoteConfigFakeConsole ${{ matrix.target }} ${{ matrix.test }}
 
   catalyst:
     # Don't run on private repo unless it is a PR.
diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
index eb1dd9f8f0f..4df045aae24 100644
--- a/.github/workflows/storage.yml
+++ b/.github/workflows/storage.yml
@@ -24,8 +24,8 @@ jobs:
       matrix:
         language: [Swift, ObjC]
         include:
-          - os: macos-14
-            xcode: Xcode_15.4
+          - os: macos-15
+            xcode: Xcode_16
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
     runs-on: ${{ matrix.os }}