diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml
index 68de68f86fb..037442efde4 100644
--- a/.github/workflows/firestore.yml
+++ b/.github/workflows/firestore.yml
@@ -296,7 +296,7 @@ jobs:
     if: |
       (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') ||
       (github.event_name == 'pull_request' && needs.changes.outputs.changed == 'true')
-    runs-on: macos-12
+    runs-on: macos-13
     needs: check
     strategy:
       matrix:
@@ -312,6 +312,8 @@ jobs:
     - uses: ruby/setup-ruby@v1
     - name: Setup Bundler
       run: ./scripts/setup_bundler.sh
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/Xcode_15.0.1.app/Contents/Developer
 
     - name: Pod lib lint
       # TODO(#9565, b/227461966): Remove --no-analyze when absl is fixed.
@@ -346,6 +348,9 @@ jobs:
         exclude:
           - os: macos-13
             platforms: 'macos'
+        # Skip matrix cells covered by pod-lib-lint job.
+          - os: macos-13
+            platforms: 'ios'
         include:
           - os: macos-12
             xcode: Xcode_14.2
diff --git a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m
index 581eb79084c..f5e829f8b33 100644
--- a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m
+++ b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m
@@ -132,7 +132,7 @@ static void SwizzleDynamicLinkNetworking(id linkResolver) {
                   withBlock:dynamicLinkNetworkingBlock];
 }
 
-static void SwizzleDynamicLinkNetworkingWithMock() {
+static void SwizzleDynamicLinkNetworkingWithMock(void) {
   id linkResolver = OCMPartialMock([[FIRDynamicLinkNetworking alloc] initWithAPIKey:kAPIKey
                                                                           URLScheme:kURLScheme]);
   [[linkResolver stub] resolveShortLink:OCMOCK_ANY FDLSDKVersion:@"1.0.0" completion:OCMOCK_ANY];
@@ -140,7 +140,7 @@ static void SwizzleDynamicLinkNetworkingWithMock() {
   SwizzleDynamicLinkNetworking(linkResolver);
 }
 
-static void UnswizzleDynamicLinkNetworking() {
+static void UnswizzleDynamicLinkNetworking(void) {
   [GULSwizzler unswizzleClass:[FIRDynamicLinks class]
                      selector:@selector(dynamicLinkNetworking)
               isClassSelector:NO];