diff --git a/.github/workflows/combine.yml b/.github/workflows/combine.yml
index fd3eddcd8e6..268d7c21d8c 100644
--- a/.github/workflows/combine.yml
+++ b/.github/workflows/combine.yml
@@ -33,12 +33,13 @@ on:
     # Rebuild on Ruby infrastructure changes.
     - 'Gemfile'
 
-    # Dependencies (Disabled to avoid building Firestore in presubmits)
-    # - 'FirebaseCore/**'
-    # - 'FirebaseAuth/**'
-    # - 'FirebaseFunctions/**'
-    # - 'Firestore/**'
-    # - 'FirebaseStorage/**'
+    # Dependencies
+    - 'FirebaseCore/**'
+    - 'FirebaseTestingSupport/**'
+    - 'FirebaseAuth/**'
+    - 'FirebaseFunctions/**'
+    - 'FirebaseStorage/**'
+    # - 'Firestore/**' # (Disabled to avoid building Firestore in presubmits)
 
   schedule:
     # Run every day at 11pm (PST) - cron uses UTC times
diff --git a/FirebaseTestingSupport/Auth/Sources/PhoneAuthProviderFake.swift b/FirebaseTestingSupport/Auth/Sources/PhoneAuthProviderFake.swift
index fa6e9d9aa4f..ef564725950 100644
--- a/FirebaseTestingSupport/Auth/Sources/PhoneAuthProviderFake.swift
+++ b/FirebaseTestingSupport/Auth/Sources/PhoneAuthProviderFake.swift
@@ -16,16 +16,16 @@
 import Foundation
 
 /// A fake object to replace a real `AuthAPNSTokenManager` in tests.
-public class PhoneAuthProviderFake: PhoneAuthProvider {
+public class PhoneAuthProviderFake: PhoneAuthProvider, @unchecked Sendable {
   override init(auth: Auth) {
     super.init(auth: auth)
   }
 
-  var verifyPhoneNumberHandler: (((String?, Error?) -> Void) -> Void)?
+  var verifyPhoneNumberHandler: ((@MainActor (String?, Error?) -> Void) -> Void)?
 
   override public func verifyPhoneNumber(_ phoneNumber: String,
                                          uiDelegate: AuthUIDelegate? = nil,
-                                         completion: ((_: String?, _: Error?) -> Void)?) {
+                                         completion: (@MainActor (String?, Error?) -> Void)?) {
     if let verifyPhoneNumberHandler,
        let completion {
       verifyPhoneNumberHandler(completion)