diff --git a/FirebaseOAuthUI/FirebaseOAuthUITests/FirebaseOAuthUITests.m b/FirebaseOAuthUI/FirebaseOAuthUITests/FirebaseOAuthUITests.m
index 1f49fa0b677..e260ded03c7 100644
--- a/FirebaseOAuthUI/FirebaseOAuthUITests/FirebaseOAuthUITests.m
+++ b/FirebaseOAuthUI/FirebaseOAuthUITests/FirebaseOAuthUITests.m
@@ -40,13 +40,13 @@ - (void)setUp {
 
   id appClass = OCMClassMock([FIRApp class]);
   OCMStub([authClass app]).andReturn(appClass);
+  
+  FIRAuth *auth = [FIRAuth auth];
+  self.authUI = [FUIAuth authUIWithAuth:auth];
 
   self.mockOAuthProvider = OCMClassMock([FIROAuthProvider class]);
-  OCMStub(ClassMethod([_mockOAuthProvider providerWithProviderID:OCMOCK_ANY])).
+  OCMStub(ClassMethod([_mockOAuthProvider providerWithProviderID:OCMOCK_ANY auth:self.authUI.auth])).
       andReturn(_mockOAuthProvider);
-
-  FIRAuth *auth = [FIRAuth auth];
-  self.authUI = [FUIAuth authUIWithAuth:auth];
 }
 
 - (void)tearDown {
@@ -78,7 +78,7 @@ - (void)testProviderValidity {
   XCTAssertNil(self.provider.accessToken);
   XCTAssertNil(self.provider.idToken);
 
-  OCMVerify([self.mockOAuthProvider providerWithProviderID:@"dummy"]);
+  OCMVerify([self.mockOAuthProvider providerWithProviderID:@"dummy" auth:self.authUI.auth]);
 }
 
 - (void)testAppleUsesEmulatorCreatesOAuthProvider {
@@ -93,7 +93,7 @@ - (void)testAppleUsesEmulatorCreatesOAuthProvider {
                                             scopes:@[]
                                   customParameters:@{}
                                       loginHintKey:nil];
-  OCMVerify([self.mockOAuthProvider providerWithProviderID:@"apple.com"]);
+  OCMVerify([self.mockOAuthProvider providerWithProviderID:@"apple.com" auth:self.authUI.auth]);
 }
 
 - (void)testAppleNoUseEmulatorNoOAuthProvider {
@@ -106,7 +106,7 @@ - (void)testAppleNoUseEmulatorNoOAuthProvider {
                                             scopes:@[]
                                   customParameters:@{}
                                       loginHintKey:nil];
-  OCMVerify(never(), [self.mockOAuthProvider providerWithProviderID:@"apple.com"]);
+  OCMVerify(never(), [self.mockOAuthProvider providerWithProviderID:@"apple.com" auth:self.authUI.auth]);
 }
 
 @end
diff --git a/FirebaseOAuthUI/Sources/FUIOAuth.m b/FirebaseOAuthUI/Sources/FUIOAuth.m
index c349ff49f7d..d17eb6d07c3 100644
--- a/FirebaseOAuthUI/Sources/FUIOAuth.m
+++ b/FirebaseOAuthUI/Sources/FUIOAuth.m
@@ -136,7 +136,7 @@ - (instancetype)initWithAuthUI:(FUIAuth *)authUI
     _customParameters = customParameters;
     _loginHintKey = loginHintKey;
     if ((_authUI.isEmulatorEnabled || ![_providerID isEqualToString:@"apple.com"]) && ![_providerID isEqualToString:@"facebook.com"]) {
-      _provider = [FIROAuthProvider providerWithProviderID:self.providerID];
+      _provider = [FIROAuthProvider providerWithProviderID:self.providerID auth:_authUI.auth];
     }
   }
   return self;