diff --git a/FirebaseAdmin/FirebaseAdmin/AppOptions.cs b/FirebaseAdmin/FirebaseAdmin/AppOptions.cs
index d7f28133..7af8a0d9 100644
--- a/FirebaseAdmin/FirebaseAdmin/AppOptions.cs
+++ b/FirebaseAdmin/FirebaseAdmin/AppOptions.cs
@@ -63,8 +63,8 @@ internal AppOptions(AppOptions options)
         public string ServiceAccountId { get; set; }
 
         /// <summary>
-        /// Gets or sets the HttpClientFactory to use when making Firebase requests.
+        /// Gets or sets the IHttpClientFactory to use when making Firebase requests.
         /// </summary>
-        public HttpClientFactory HttpClientFactory { get; set; }
+        public IHttpClientFactory HttpClientFactory { get; set; }
     }
 }
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/FixedAccountIAMSigner.cs b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/FixedAccountIAMSigner.cs
index fbb7e7b3..524d3a3e 100644
--- a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/FixedAccountIAMSigner.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/FixedAccountIAMSigner.cs
@@ -57,7 +57,7 @@ public override Task<string> GetKeyIdAsync(
 
         internal class Args
         {
-            internal HttpClientFactory ClientFactory { get; set; }
+            internal IHttpClientFactory ClientFactory { get; set; }
 
             internal GoogleCredential Credential { get; set; }
 
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/HttpPublicKeySource.cs b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/HttpPublicKeySource.cs
index b7786c94..8a905106 100644
--- a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/HttpPublicKeySource.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/HttpPublicKeySource.cs
@@ -43,11 +43,11 @@ internal sealed class HttpPublicKeySource : IPublicKeySource
         private readonly SemaphoreSlim cacheLock = new SemaphoreSlim(1, 1);
         private readonly string certUrl;
         private readonly IClock clock;
-        private readonly HttpClientFactory clientFactory;
+        private readonly IHttpClientFactory clientFactory;
         private DateTime expirationTime;
         private IReadOnlyList<PublicKey> cachedKeys;
 
-        public HttpPublicKeySource(string certUrl, IClock clock, HttpClientFactory clientFactory)
+        public HttpPublicKeySource(string certUrl, IClock clock, IHttpClientFactory clientFactory)
         {
             this.certUrl = certUrl.ThrowIfNullOrEmpty(nameof(certUrl));
             this.clock = clock.ThrowIfNull(nameof(clock));
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/IAMSigner.cs b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/IAMSigner.cs
index 559667da..a801ad21 100644
--- a/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/IAMSigner.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Auth/Jwt/IAMSigner.cs
@@ -43,7 +43,7 @@ internal class IAMSigner : ISigner
         private readonly Lazy<Task<string>> keyId;
 
         public IAMSigner(
-            HttpClientFactory clientFactory, GoogleCredential credential, RetryOptions retryOptions = null)
+            IHttpClientFactory clientFactory, GoogleCredential credential, RetryOptions retryOptions = null)
         {
             this.httpClient = new ErrorHandlingHttpClient<FirebaseAuthException>(
                 new ErrorHandlingHttpClientArgs<FirebaseAuthException>()
@@ -114,7 +114,7 @@ internal static IAMSigner Create(FirebaseApp app)
         }
 
         private static async Task<string> DiscoverServiceAccountIdAsync(
-            HttpClientFactory clientFactory)
+            IHttpClientFactory clientFactory)
         {
             using (var client = clientFactory.CreateDefaultHttpClient())
             {
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/Multitenancy/TenantManager.cs b/FirebaseAdmin/FirebaseAdmin/Auth/Multitenancy/TenantManager.cs
index bdab6bd8..b2314238 100644
--- a/FirebaseAdmin/FirebaseAdmin/Auth/Multitenancy/TenantManager.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Auth/Multitenancy/TenantManager.cs
@@ -375,7 +375,7 @@ internal sealed class Args
         {
             internal FirebaseApp App { get; set; }
 
-            internal HttpClientFactory ClientFactory { get; set; }
+            internal IHttpClientFactory ClientFactory { get; set; }
 
             internal GoogleCredential Credential { get; set; }
 
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/Providers/ProviderConfigManager.cs b/FirebaseAdmin/FirebaseAdmin/Auth/Providers/ProviderConfigManager.cs
index a14ec262..94962b78 100644
--- a/FirebaseAdmin/FirebaseAdmin/Auth/Providers/ProviderConfigManager.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Auth/Providers/ProviderConfigManager.cs
@@ -148,7 +148,7 @@ internal PagedAsyncEnumerable<AuthProviderConfigs<SamlProviderConfig>, SamlProvi
 
         internal sealed class Args
         {
-            internal HttpClientFactory ClientFactory { get; set; }
+            internal IHttpClientFactory ClientFactory { get; set; }
 
             internal GoogleCredential Credential { get; set; }
 
diff --git a/FirebaseAdmin/FirebaseAdmin/Auth/Users/FirebaseUserManager.cs b/FirebaseAdmin/FirebaseAdmin/Auth/Users/FirebaseUserManager.cs
index e535c5c5..df4f9b93 100644
--- a/FirebaseAdmin/FirebaseAdmin/Auth/Users/FirebaseUserManager.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Auth/Users/FirebaseUserManager.cs
@@ -438,7 +438,7 @@ private async Task<DeserializedResponseInfo<TResult>> PostAndDeserializeAsync<TR
 
         internal sealed class Args
         {
-            internal HttpClientFactory ClientFactory { get; set; }
+            internal IHttpClientFactory ClientFactory { get; set; }
 
             internal GoogleCredential Credential { get; set; }
 
diff --git a/FirebaseAdmin/FirebaseAdmin/Extensions.cs b/FirebaseAdmin/FirebaseAdmin/Extensions.cs
index d1c38889..f2538afd 100644
--- a/FirebaseAdmin/FirebaseAdmin/Extensions.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Extensions.cs
@@ -67,10 +67,10 @@ public static ServiceAccountCredential ToServiceAccountCredential(
         /// factory.
         /// </summary>
         /// <returns>An HTTP client that can be used to make unauthenticated requests.</returns>
-        /// <param name="clientFactory">The <see cref="HttpClientFactory"/> used to create
+        /// <param name="clientFactory">The <see cref="IHttpClientFactory"/> used to create
         /// the HTTP client.</param>
         public static ConfigurableHttpClient CreateDefaultHttpClient(
-            this HttpClientFactory clientFactory)
+            this IHttpClientFactory clientFactory)
         {
             return clientFactory.CreateHttpClient(new CreateHttpClientArgs());
         }
diff --git a/FirebaseAdmin/FirebaseAdmin/Messaging/FirebaseMessagingClient.cs b/FirebaseAdmin/FirebaseAdmin/Messaging/FirebaseMessagingClient.cs
index 98d2031d..2a5d5478 100644
--- a/FirebaseAdmin/FirebaseAdmin/Messaging/FirebaseMessagingClient.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Messaging/FirebaseMessagingClient.cs
@@ -600,7 +600,7 @@ internal class SingleMessageResponse
 
         internal sealed class Args
         {
-            internal HttpClientFactory ClientFactory { get; set; }
+            internal IHttpClientFactory ClientFactory { get; set; }
 
             internal GoogleCredential Credential { get; set; }
 
diff --git a/FirebaseAdmin/FirebaseAdmin/Messaging/InstanceIdClient.cs b/FirebaseAdmin/FirebaseAdmin/Messaging/InstanceIdClient.cs
index d7c274fd..4711794e 100644
--- a/FirebaseAdmin/FirebaseAdmin/Messaging/InstanceIdClient.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Messaging/InstanceIdClient.cs
@@ -46,7 +46,7 @@ internal sealed class InstanceIdClient : IDisposable
         /// <param name="credential">An instance of the <see cref="GoogleCredential"/> class.</param>
         /// <param name="retryOptions">An instance of the <see cref="RetryOptions"/> class.</param>
         internal InstanceIdClient(
-            HttpClientFactory clientFactory, GoogleCredential credential, RetryOptions retryOptions = null)
+            IHttpClientFactory clientFactory, GoogleCredential credential, RetryOptions retryOptions = null)
         {
             this.httpClient = new ErrorHandlingHttpClient<FirebaseMessagingException>(
                 new ErrorHandlingHttpClientArgs<FirebaseMessagingException>()
diff --git a/FirebaseAdmin/FirebaseAdmin/Util/ErrorHandlingHttpClientArgs.cs b/FirebaseAdmin/FirebaseAdmin/Util/ErrorHandlingHttpClientArgs.cs
index 607d9b66..7306b753 100644
--- a/FirebaseAdmin/FirebaseAdmin/Util/ErrorHandlingHttpClientArgs.cs
+++ b/FirebaseAdmin/FirebaseAdmin/Util/ErrorHandlingHttpClientArgs.cs
@@ -25,7 +25,7 @@ namespace FirebaseAdmin.Util
     internal sealed class ErrorHandlingHttpClientArgs<T>
     where T : FirebaseException
     {
-        internal HttpClientFactory HttpClientFactory { get; set; }
+        internal IHttpClientFactory HttpClientFactory { get; set; }
 
         internal GoogleCredential Credential { get; set; }