diff --git a/src/StripeTests/BaseStripeTest.cs b/src/StripeTests/BaseStripeTest.cs
index 84c25d28b6..027fffaf4d 100644
--- a/src/StripeTests/BaseStripeTest.cs
+++ b/src/StripeTests/BaseStripeTest.cs
@@ -5,36 +5,86 @@ namespace StripeTests
     using System.Net.Http;
     using System.Reflection;
     using System.Text;
+    using Stripe;
     using Xunit;
 
     [Collection("stripe-mock tests")]
     public class BaseStripeTest
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseStripeTest"/> with no fixtures.
+        /// </summary>
         public BaseStripeTest()
             : this(null, null)
         {
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseStripeTest"/> with the
+        /// <see cref="StripeMockFixture"/> fixture. Use this constructor for tests that need to
+        /// send requests to stripe-mock, but don't need mocking capabilities (i.e. don't need to
+        /// assert or stub HTTP requests).
+        /// </summary>
         public BaseStripeTest(StripeMockFixture stripeMockFixture)
             : this(stripeMockFixture, null)
         {
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseStripeTest"/> with the
+        /// <see cref="MockHttpClientFixture"/> fixture. Use this constructor for tests that need
+        /// mocking capabilities (i.e. need to assert or stub HTTP requests) but don't need to send
+        /// requests to stripe-mock.
+        /// </summary>
         public BaseStripeTest(MockHttpClientFixture mockHttpClientFixture)
             : this(null, mockHttpClientFixture)
         {
         }
 
-        public BaseStripeTest(StripeMockFixture stripeMockFixture, MockHttpClientFixture mockHttpClientFixture)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseStripeTest"/> with both the
+        /// <see cref="StripeMockFixture"/> and the <see cref="MockHttpClientFixture"/> fixtures.
+        /// Use this constructor for tests that need to send requests to stripe-mock and also need
+        /// mocking capabilities (i.e. need to assert or stub HTTP requests).
+        /// </summary>
+        public BaseStripeTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
         {
             this.StripeMockFixture = stripeMockFixture;
             this.MockHttpClientFixture = mockHttpClientFixture;
 
-            if (this.MockHttpClientFixture != null)
+            if ((this.StripeMockFixture != null) && (this.MockHttpClientFixture != null))
+            {
+                // Set up StripeClient to use stripe-mock with the mock HTTP client
+                var httpClient = new SystemNetHttpClient(
+                    new HttpClient(this.MockHttpClientFixture.MockHandler.Object));
+                StripeConfiguration.StripeClient = this.StripeMockFixture.BuildStripeClient(
+                    httpClient: httpClient);
+
+                // Reset the mock before each test
+                this.MockHttpClientFixture.Reset();
+            }
+            else if (this.StripeMockFixture != null)
             {
+                // Set up StripeClient to use stripe-mock
+                StripeConfiguration.StripeClient = this.StripeMockFixture.BuildStripeClient();
+            }
+            else if (this.MockHttpClientFixture != null)
+            {
+                // Set up StripeClient with the mock HTTP client
+                var httpClient = new SystemNetHttpClient(
+                    new HttpClient(this.MockHttpClientFixture.MockHandler.Object));
+                StripeConfiguration.StripeClient = new StripeClient(httpClient: httpClient);
+
                 // Reset the mock before each test
                 this.MockHttpClientFixture.Reset();
             }
+            else
+            {
+                // Use the default StripeClient
+                StripeConfiguration.StripeClient = null;
+            }
         }
 
         protected MockHttpClientFixture MockHttpClientFixture { get; }
diff --git a/src/StripeTests/Infrastructure/Public/StripeResponseTest.cs b/src/StripeTests/Infrastructure/Public/StripeResponseTest.cs
index 8b121dc051..ce70be0cb0 100644
--- a/src/StripeTests/Infrastructure/Public/StripeResponseTest.cs
+++ b/src/StripeTests/Infrastructure/Public/StripeResponseTest.cs
@@ -8,8 +8,8 @@ namespace StripeTests
 
     public class StripeResponseTest : BaseStripeTest
     {
-        public StripeResponseTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public StripeResponseTest(StripeMockFixture stripeMockFixture)
+            : base(stripeMockFixture)
         {
         }
 
diff --git a/src/StripeTests/Infrastructure/Public/SystemNetHttpClientTest.cs b/src/StripeTests/Infrastructure/Public/SystemNetHttpClientTest.cs
index cda62944fd..88fb04764b 100644
--- a/src/StripeTests/Infrastructure/Public/SystemNetHttpClientTest.cs
+++ b/src/StripeTests/Infrastructure/Public/SystemNetHttpClientTest.cs
@@ -14,19 +14,24 @@ namespace StripeTests
 
     public class SystemNetHttpClientTest : BaseStripeTest
     {
+        public SystemNetHttpClientTest(MockHttpClientFixture mockHttpClientFixture)
+            : base(mockHttpClientFixture)
+        {
+        }
+
         [Fact]
         public async Task MakeRequestAsync()
         {
             var responseMessage = new HttpResponseMessage(HttpStatusCode.OK);
             responseMessage.Content = new StringContent("Hello world!");
-            var mockHandler = new Mock<HttpClientHandler>();
-            mockHandler.Protected()
+            this.MockHttpClientFixture.MockHandler.Protected()
                 .Setup<Task<HttpResponseMessage>>(
                     "SendAsync",
                     ItExpr.IsAny<HttpRequestMessage>(),
                     ItExpr.IsAny<CancellationToken>())
                 .Returns(Task.FromResult(responseMessage));
-            var client = new SystemNetHttpClient(new System.Net.Http.HttpClient(mockHandler.Object));
+            var client = new SystemNetHttpClient(
+                new HttpClient(this.MockHttpClientFixture.MockHandler.Object));
             var request = new StripeRequest(HttpMethod.Post, "/foo", null, null);
 
             var response = await client.MakeRequestAsync(request);
@@ -52,19 +57,19 @@ public async Task UserAgentIncludesAppInfo()
 
                 var responseMessage = new HttpResponseMessage(HttpStatusCode.OK);
                 responseMessage.Content = new StringContent("Hello world!");
-                var mockHandler = new Mock<HttpClientHandler>();
-                mockHandler.Protected()
+                this.MockHttpClientFixture.MockHandler.Protected()
                     .Setup<Task<HttpResponseMessage>>(
                         "SendAsync",
                         ItExpr.IsAny<HttpRequestMessage>(),
                         ItExpr.IsAny<CancellationToken>())
                     .Returns(Task.FromResult(responseMessage));
 
-                var client = new SystemNetHttpClient(new System.Net.Http.HttpClient(mockHandler.Object));
+                var client = new SystemNetHttpClient(
+                    new HttpClient(this.MockHttpClientFixture.MockHandler.Object));
                 var request = new StripeRequest(HttpMethod.Post, "/foo", null, null);
                 await client.MakeRequestAsync(request);
 
-                mockHandler.Protected()
+                this.MockHttpClientFixture.MockHandler.Protected()
                     .Verify(
                         "SendAsync",
                         Times.Once(),
diff --git a/src/StripeTests/Infrastructure/StripeExceptionTest.cs b/src/StripeTests/Infrastructure/StripeExceptionTest.cs
index 8c6ce6aed5..72dbdda363 100644
--- a/src/StripeTests/Infrastructure/StripeExceptionTest.cs
+++ b/src/StripeTests/Infrastructure/StripeExceptionTest.cs
@@ -6,6 +6,11 @@ namespace StripeTests
 
     public class StripeExceptionTest : BaseStripeTest
     {
+        public StripeExceptionTest(StripeMockFixture stripeMockFixture)
+            : base(stripeMockFixture)
+        {
+        }
+
         [Fact]
         public async Task SetsStripeResponse()
         {
diff --git a/src/StripeTests/MockHttpClientFixture.cs b/src/StripeTests/MockHttpClientFixture.cs
index 07ee61f559..2f5cece323 100644
--- a/src/StripeTests/MockHttpClientFixture.cs
+++ b/src/StripeTests/MockHttpClientFixture.cs
@@ -1,6 +1,5 @@
 namespace StripeTests
 {
-    using System;
     using System.Net;
     using System.Net.Http;
     using System.Threading;
@@ -8,31 +7,22 @@ namespace StripeTests
     using Moq;
     using Moq.Protected;
     using Stripe;
-    using Stripe.Infrastructure;
 
-    public class MockHttpClientFixture : IDisposable
+    public class MockHttpClientFixture
     {
-        private readonly IStripeClient origClient;
-
         public MockHttpClientFixture()
         {
             this.MockHandler = new Mock<HttpClientHandler>
             {
                 CallBase = true
             };
-            var httpClient = new System.Net.Http.HttpClient(this.MockHandler.Object);
-            var stripeClient = new StripeClient(new Stripe.SystemNetHttpClient(httpClient));
-
-            this.origClient = StripeConfiguration.StripeClient;
-            StripeConfiguration.StripeClient = stripeClient;
+            this.HttpClient = new SystemNetHttpClient(
+                new System.Net.Http.HttpClient(this.MockHandler.Object));
         }
 
         public Mock<HttpClientHandler> MockHandler { get; }
 
-        public void Dispose()
-        {
-            StripeConfiguration.StripeClient = this.origClient;
-        }
+        public SystemNetHttpClient HttpClient { get; }
 
         /// <summary>
         /// Resets the mock's state.
diff --git a/src/StripeTests/Services/AccountLinks/AccountLinkServiceTest.cs b/src/StripeTests/Services/AccountLinks/AccountLinkServiceTest.cs
index 90444d38e5..4fff95ce77 100644
--- a/src/StripeTests/Services/AccountLinks/AccountLinkServiceTest.cs
+++ b/src/StripeTests/Services/AccountLinks/AccountLinkServiceTest.cs
@@ -12,8 +12,10 @@ public class AccountLinkServiceTest : BaseStripeTest
         private readonly AccountLinkService service;
         private readonly AccountLinkCreateOptions createOptions;
 
-        public AccountLinkServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public AccountLinkServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new AccountLinkService();
 
diff --git a/src/StripeTests/Services/Accounts/AccountServiceTest.cs b/src/StripeTests/Services/Accounts/AccountServiceTest.cs
index 3f944640e9..af81537fc1 100644
--- a/src/StripeTests/Services/Accounts/AccountServiceTest.cs
+++ b/src/StripeTests/Services/Accounts/AccountServiceTest.cs
@@ -19,8 +19,10 @@ public class AccountServiceTest : BaseStripeTest
         private readonly AccountListOptions listOptions;
         private readonly AccountRejectOptions rejectOptions;
 
-        public AccountServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public AccountServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new AccountService();
 
diff --git a/src/StripeTests/Services/ApplePayDomains/ApplePayDomainServiceTest.cs b/src/StripeTests/Services/ApplePayDomains/ApplePayDomainServiceTest.cs
index 5391440044..2857757f17 100644
--- a/src/StripeTests/Services/ApplePayDomains/ApplePayDomainServiceTest.cs
+++ b/src/StripeTests/Services/ApplePayDomains/ApplePayDomainServiceTest.cs
@@ -15,8 +15,10 @@ public class ApplePayDomainServiceTest : BaseStripeTest
         private readonly ApplePayDomainCreateOptions createOptions;
         private readonly ApplePayDomainListOptions listOptions;
 
-        public ApplePayDomainServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ApplePayDomainServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ApplePayDomainService();
 
diff --git a/src/StripeTests/Services/ApplicationFeeRefunds/ApplicationFeeRefundServiceTest.cs b/src/StripeTests/Services/ApplicationFeeRefunds/ApplicationFeeRefundServiceTest.cs
index 4f9879e5d5..960f411ad1 100644
--- a/src/StripeTests/Services/ApplicationFeeRefunds/ApplicationFeeRefundServiceTest.cs
+++ b/src/StripeTests/Services/ApplicationFeeRefunds/ApplicationFeeRefundServiceTest.cs
@@ -18,8 +18,10 @@ public class ApplicationFeeRefundServiceTest : BaseStripeTest
         private readonly ApplicationFeeRefundUpdateOptions updateOptions;
         private readonly ApplicationFeeRefundListOptions listOptions;
 
-        public ApplicationFeeRefundServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ApplicationFeeRefundServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ApplicationFeeRefundService();
 
diff --git a/src/StripeTests/Services/ApplicationFees/ApplicationFeeServiceTest.cs b/src/StripeTests/Services/ApplicationFees/ApplicationFeeServiceTest.cs
index 1387e4d89d..8c7730688e 100644
--- a/src/StripeTests/Services/ApplicationFees/ApplicationFeeServiceTest.cs
+++ b/src/StripeTests/Services/ApplicationFees/ApplicationFeeServiceTest.cs
@@ -14,8 +14,10 @@ public class ApplicationFeeServiceTest : BaseStripeTest
         private readonly ApplicationFeeService service;
         private readonly ApplicationFeeListOptions listOptions;
 
-        public ApplicationFeeServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ApplicationFeeServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ApplicationFeeService();
 
diff --git a/src/StripeTests/Services/Balance/BalanceServiceTest.cs b/src/StripeTests/Services/Balance/BalanceServiceTest.cs
index ea5f0b9174..f7fa69c393 100644
--- a/src/StripeTests/Services/Balance/BalanceServiceTest.cs
+++ b/src/StripeTests/Services/Balance/BalanceServiceTest.cs
@@ -11,8 +11,10 @@ public class BalanceServiceTest : BaseStripeTest
     {
         private readonly BalanceService service;
 
-        public BalanceServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public BalanceServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new BalanceService();
         }
diff --git a/src/StripeTests/Services/BalanceTransactions/BalanceTransactionServiceTest.cs b/src/StripeTests/Services/BalanceTransactions/BalanceTransactionServiceTest.cs
index 0eae12b0db..0aa82db7aa 100644
--- a/src/StripeTests/Services/BalanceTransactions/BalanceTransactionServiceTest.cs
+++ b/src/StripeTests/Services/BalanceTransactions/BalanceTransactionServiceTest.cs
@@ -14,8 +14,10 @@ public class BalanceTransactionServiceTest : BaseStripeTest
         private readonly BalanceTransactionService service;
         private readonly BalanceTransactionListOptions listOptions;
 
-        public BalanceTransactionServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public BalanceTransactionServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new BalanceTransactionService();
 
diff --git a/src/StripeTests/Services/BankAccounts/BankAccountServiceTest.cs b/src/StripeTests/Services/BankAccounts/BankAccountServiceTest.cs
index 7df23ff45b..53c5186792 100644
--- a/src/StripeTests/Services/BankAccounts/BankAccountServiceTest.cs
+++ b/src/StripeTests/Services/BankAccounts/BankAccountServiceTest.cs
@@ -19,8 +19,10 @@ public class BankAccountServiceTest : BaseStripeTest
         private readonly BankAccountListOptions listOptions;
         private readonly BankAccountVerifyOptions verifyOptions;
 
-        public BankAccountServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public BankAccountServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new BankAccountService();
 
diff --git a/src/StripeTests/Services/Capabilities/CapabilityServiceTest.cs b/src/StripeTests/Services/Capabilities/CapabilityServiceTest.cs
index a1594b5b1d..fbdd9e7811 100644
--- a/src/StripeTests/Services/Capabilities/CapabilityServiceTest.cs
+++ b/src/StripeTests/Services/Capabilities/CapabilityServiceTest.cs
@@ -16,8 +16,10 @@ public class CapabilityServiceTest : BaseStripeTest
         private readonly CapabilityUpdateOptions updateOptions;
         private readonly CapabilityListOptions listOptions;
 
-        public CapabilityServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public CapabilityServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new CapabilityService();
 
diff --git a/src/StripeTests/Services/Cards/CardServiceTest.cs b/src/StripeTests/Services/Cards/CardServiceTest.cs
index e8dad336e8..6e3cefe253 100644
--- a/src/StripeTests/Services/Cards/CardServiceTest.cs
+++ b/src/StripeTests/Services/Cards/CardServiceTest.cs
@@ -22,8 +22,10 @@ public class CardServiceTest : BaseStripeTest
         private readonly CardUpdateOptions updateOptions;
         private readonly CardListOptions listOptions;
 
-        public CardServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public CardServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new CardService();
 
diff --git a/src/StripeTests/Services/Charges/ChargeServiceTest.cs b/src/StripeTests/Services/Charges/ChargeServiceTest.cs
index 3190dd4068..48241af564 100644
--- a/src/StripeTests/Services/Charges/ChargeServiceTest.cs
+++ b/src/StripeTests/Services/Charges/ChargeServiceTest.cs
@@ -18,8 +18,10 @@ public class ChargeServiceTest : BaseStripeTest
         private readonly ChargeUpdateOptions updateOptions;
         private readonly ChargeListOptions listOptions;
 
-        public ChargeServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ChargeServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ChargeService();
 
diff --git a/src/StripeTests/Services/Checkout/SessionServiceTest.cs b/src/StripeTests/Services/Checkout/SessionServiceTest.cs
index e3b7d0a1a5..56cc6643f3 100644
--- a/src/StripeTests/Services/Checkout/SessionServiceTest.cs
+++ b/src/StripeTests/Services/Checkout/SessionServiceTest.cs
@@ -14,8 +14,10 @@ public class SessionServiceTest : BaseStripeTest
         private readonly SessionService service;
         private readonly SessionCreateOptions createOptions;
 
-        public SessionServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public SessionServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new SessionService();
 
diff --git a/src/StripeTests/Services/CountrySpecs/CountrySpecServiceTest.cs b/src/StripeTests/Services/CountrySpecs/CountrySpecServiceTest.cs
index 92c927300c..b0f4e0f1f7 100644
--- a/src/StripeTests/Services/CountrySpecs/CountrySpecServiceTest.cs
+++ b/src/StripeTests/Services/CountrySpecs/CountrySpecServiceTest.cs
@@ -14,8 +14,10 @@ public class CountrySpecServiceTest : BaseStripeTest
         private readonly CountrySpecService service;
         private readonly CountrySpecListOptions listOptions;
 
-        public CountrySpecServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public CountrySpecServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new CountrySpecService();
 
diff --git a/src/StripeTests/Services/Coupons/CouponServiceTest.cs b/src/StripeTests/Services/Coupons/CouponServiceTest.cs
index c6b4f79f2c..1c280fd15d 100644
--- a/src/StripeTests/Services/Coupons/CouponServiceTest.cs
+++ b/src/StripeTests/Services/Coupons/CouponServiceTest.cs
@@ -17,8 +17,10 @@ public class CouponServiceTest : BaseStripeTest
         private readonly CouponUpdateOptions updateOptions;
         private readonly CouponListOptions listOptions;
 
-        public CouponServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public CouponServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new CouponService();
 
diff --git a/src/StripeTests/Services/CreditNotes/CreditNoteServiceTest.cs b/src/StripeTests/Services/CreditNotes/CreditNoteServiceTest.cs
index 66de8d585f..f908b74f0e 100644
--- a/src/StripeTests/Services/CreditNotes/CreditNoteServiceTest.cs
+++ b/src/StripeTests/Services/CreditNotes/CreditNoteServiceTest.cs
@@ -18,8 +18,10 @@ public class CreditNoteServiceTest : BaseStripeTest
         private readonly CreditNoteListOptions listOptions;
         private readonly CreditNoteVoidOptions voidOptions;
 
-        public CreditNoteServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public CreditNoteServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new CreditNoteService();
 
diff --git a/src/StripeTests/Services/Customers/CustomerServiceTest.cs b/src/StripeTests/Services/Customers/CustomerServiceTest.cs
index 3592f7ca66..dd76440d6a 100644
--- a/src/StripeTests/Services/Customers/CustomerServiceTest.cs
+++ b/src/StripeTests/Services/Customers/CustomerServiceTest.cs
@@ -17,8 +17,10 @@ public class CustomerServiceTest : BaseStripeTest
         private readonly CustomerUpdateOptions updateOptions;
         private readonly CustomerListOptions listOptions;
 
-        public CustomerServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public CustomerServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new CustomerService();
 
diff --git a/src/StripeTests/Services/Discounts/DiscountServiceTest.cs b/src/StripeTests/Services/Discounts/DiscountServiceTest.cs
index f5877f5c2a..9150cdc434 100644
--- a/src/StripeTests/Services/Discounts/DiscountServiceTest.cs
+++ b/src/StripeTests/Services/Discounts/DiscountServiceTest.cs
@@ -11,8 +11,10 @@ public class DiscountServiceTest : BaseStripeTest
     {
         private readonly DiscountService service;
 
-        public DiscountServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public DiscountServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new DiscountService();
         }
diff --git a/src/StripeTests/Services/Disputes/DisputeServiceTest.cs b/src/StripeTests/Services/Disputes/DisputeServiceTest.cs
index 07a7590a5f..bdbf93c184 100644
--- a/src/StripeTests/Services/Disputes/DisputeServiceTest.cs
+++ b/src/StripeTests/Services/Disputes/DisputeServiceTest.cs
@@ -16,8 +16,10 @@ public class DisputeServiceTest : BaseStripeTest
         private readonly DisputeUpdateOptions updateOptions;
         private readonly DisputeListOptions listOptions;
 
-        public DisputeServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public DisputeServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new DisputeService();
 
diff --git a/src/StripeTests/Services/EphemeralKeys/EphemeralKeyServiceTest.cs b/src/StripeTests/Services/EphemeralKeys/EphemeralKeyServiceTest.cs
index f984bcc7c4..73785fd34c 100644
--- a/src/StripeTests/Services/EphemeralKeys/EphemeralKeyServiceTest.cs
+++ b/src/StripeTests/Services/EphemeralKeys/EphemeralKeyServiceTest.cs
@@ -14,8 +14,10 @@ public class EphemeralKeyServiceTest : BaseStripeTest
         private readonly EphemeralKeyService service;
         private readonly EphemeralKeyCreateOptions createOptions;
 
-        public EphemeralKeyServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public EphemeralKeyServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new EphemeralKeyService();
 
diff --git a/src/StripeTests/Services/Events/EventServiceTest.cs b/src/StripeTests/Services/Events/EventServiceTest.cs
index 82e17e7d10..741c134ba5 100644
--- a/src/StripeTests/Services/Events/EventServiceTest.cs
+++ b/src/StripeTests/Services/Events/EventServiceTest.cs
@@ -14,8 +14,10 @@ public class EventServiceTest : BaseStripeTest
         private readonly EventService service;
         private readonly EventListOptions listOptions;
 
-        public EventServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public EventServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new EventService();
 
diff --git a/src/StripeTests/Services/Events/EventUtilityTest.cs b/src/StripeTests/Services/Events/EventUtilityTest.cs
index 0276875fee..ec464c23b9 100644
--- a/src/StripeTests/Services/Events/EventUtilityTest.cs
+++ b/src/StripeTests/Services/Events/EventUtilityTest.cs
@@ -10,8 +10,8 @@ public class EventUtilityTest : BaseStripeTest
         private readonly string json;
         private readonly string secret;
 
-        public EventUtilityTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public EventUtilityTest()
+            : base()
         {
             this.eventTimestamp = 1533204620;
             this.secret = "webhook_secret";
diff --git a/src/StripeTests/Services/ExchangeRates/ExchangeRateServiceTest.cs b/src/StripeTests/Services/ExchangeRates/ExchangeRateServiceTest.cs
index b4ab4c23f6..df03f0c17b 100644
--- a/src/StripeTests/Services/ExchangeRates/ExchangeRateServiceTest.cs
+++ b/src/StripeTests/Services/ExchangeRates/ExchangeRateServiceTest.cs
@@ -12,8 +12,10 @@ public class ExchangeRateServiceTest : BaseStripeTest
         private readonly ExchangeRateService service;
         private readonly ExchangeRateListOptions listOptions;
 
-        public ExchangeRateServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ExchangeRateServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ExchangeRateService();
 
diff --git a/src/StripeTests/Services/ExternalAccounts/ExternalAccountServiceTest.cs b/src/StripeTests/Services/ExternalAccounts/ExternalAccountServiceTest.cs
index e0a1957d36..f470c40e04 100644
--- a/src/StripeTests/Services/ExternalAccounts/ExternalAccountServiceTest.cs
+++ b/src/StripeTests/Services/ExternalAccounts/ExternalAccountServiceTest.cs
@@ -18,8 +18,10 @@ public class ExternalAccountServiceTest : BaseStripeTest
         private readonly ExternalAccountUpdateOptions updateOptions;
         private readonly ExternalAccountListOptions listOptions;
 
-        public ExternalAccountServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ExternalAccountServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ExternalAccountService();
 
diff --git a/src/StripeTests/Services/FileLinks/FileLinkServiceTest.cs b/src/StripeTests/Services/FileLinks/FileLinkServiceTest.cs
index 160e2fa507..b8bef032fc 100644
--- a/src/StripeTests/Services/FileLinks/FileLinkServiceTest.cs
+++ b/src/StripeTests/Services/FileLinks/FileLinkServiceTest.cs
@@ -17,8 +17,10 @@ public class FileLinkServiceTest : BaseStripeTest
         private readonly FileLinkUpdateOptions updateOptions;
         private readonly FileLinkListOptions listOptions;
 
-        public FileLinkServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public FileLinkServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new FileLinkService();
 
diff --git a/src/StripeTests/Services/Files/FileServiceTest.cs b/src/StripeTests/Services/Files/FileServiceTest.cs
index 21c5a0f4ba..c56785a046 100644
--- a/src/StripeTests/Services/Files/FileServiceTest.cs
+++ b/src/StripeTests/Services/Files/FileServiceTest.cs
@@ -18,8 +18,10 @@ public class FileServiceTest : BaseStripeTest
         private readonly FileCreateOptions createOptions;
         private readonly FileListOptions listOptions;
 
-        public FileServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public FileServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new FileService();
 
diff --git a/src/StripeTests/Services/InvoiceItems/InvoiceItemServiceTest.cs b/src/StripeTests/Services/InvoiceItems/InvoiceItemServiceTest.cs
index bc430d043b..28ab2ce01e 100644
--- a/src/StripeTests/Services/InvoiceItems/InvoiceItemServiceTest.cs
+++ b/src/StripeTests/Services/InvoiceItems/InvoiceItemServiceTest.cs
@@ -17,8 +17,10 @@ public class InvoiceItemServiceTest : BaseStripeTest
         private readonly InvoiceItemUpdateOptions updateOptions;
         private readonly InvoiceItemListOptions listOptions;
 
-        public InvoiceItemServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public InvoiceItemServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new InvoiceItemService();
 
diff --git a/src/StripeTests/Services/Invoices/InvoiceServiceTest.cs b/src/StripeTests/Services/Invoices/InvoiceServiceTest.cs
index b86e074523..6db5e7ce8b 100644
--- a/src/StripeTests/Services/Invoices/InvoiceServiceTest.cs
+++ b/src/StripeTests/Services/Invoices/InvoiceServiceTest.cs
@@ -25,8 +25,10 @@ public class InvoiceServiceTest : BaseStripeTest
         private readonly InvoiceSendOptions sendOptions;
         private readonly InvoiceVoidOptions voidOptions;
 
-        public InvoiceServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public InvoiceServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new InvoiceService();
 
diff --git a/src/StripeTests/Services/Issuing/Authorizations/AuthorizationServiceTest.cs b/src/StripeTests/Services/Issuing/Authorizations/AuthorizationServiceTest.cs
index 6d24fec612..c2e2377112 100644
--- a/src/StripeTests/Services/Issuing/Authorizations/AuthorizationServiceTest.cs
+++ b/src/StripeTests/Services/Issuing/Authorizations/AuthorizationServiceTest.cs
@@ -16,8 +16,10 @@ public class AuthorizationServiceTest : BaseStripeTest
         private readonly AuthorizationUpdateOptions updateOptions;
         private readonly AuthorizationListOptions listOptions;
 
-        public AuthorizationServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public AuthorizationServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new AuthorizationService();
 
diff --git a/src/StripeTests/Services/Issuing/Cardholders/CardholderServiceTest.cs b/src/StripeTests/Services/Issuing/Cardholders/CardholderServiceTest.cs
index e7c4528ef1..a6d317d95a 100644
--- a/src/StripeTests/Services/Issuing/Cardholders/CardholderServiceTest.cs
+++ b/src/StripeTests/Services/Issuing/Cardholders/CardholderServiceTest.cs
@@ -18,8 +18,10 @@ public class CardholderServiceTest : BaseStripeTest
         private readonly CardholderUpdateOptions updateOptions;
         private readonly CardholderListOptions listOptions;
 
-        public CardholderServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public CardholderServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new CardholderService();
 
diff --git a/src/StripeTests/Services/Issuing/Cards/IssuingCardServiceTest.cs b/src/StripeTests/Services/Issuing/Cards/IssuingCardServiceTest.cs
index e95a270739..3463127af3 100644
--- a/src/StripeTests/Services/Issuing/Cards/IssuingCardServiceTest.cs
+++ b/src/StripeTests/Services/Issuing/Cards/IssuingCardServiceTest.cs
@@ -17,8 +17,10 @@ public class IssuingCardServiceTest : BaseStripeTest
         private readonly CardUpdateOptions updateOptions;
         private readonly CardListOptions listOptions;
 
-        public IssuingCardServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public IssuingCardServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new CardService();
 
diff --git a/src/StripeTests/Services/Issuing/Disputes/IssuingDisputeServiceTest.cs b/src/StripeTests/Services/Issuing/Disputes/IssuingDisputeServiceTest.cs
index fad6f14298..805ef82449 100644
--- a/src/StripeTests/Services/Issuing/Disputes/IssuingDisputeServiceTest.cs
+++ b/src/StripeTests/Services/Issuing/Disputes/IssuingDisputeServiceTest.cs
@@ -17,8 +17,10 @@ public class IssuingDisputeServiceTest : BaseStripeTest
         private readonly DisputeUpdateOptions updateOptions;
         private readonly DisputeListOptions listOptions;
 
-        public IssuingDisputeServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public IssuingDisputeServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new DisputeService();
 
diff --git a/src/StripeTests/Services/Issuing/Transactions/TransactionServiceTest.cs b/src/StripeTests/Services/Issuing/Transactions/TransactionServiceTest.cs
index fbcc48bd63..c2522d4118 100644
--- a/src/StripeTests/Services/Issuing/Transactions/TransactionServiceTest.cs
+++ b/src/StripeTests/Services/Issuing/Transactions/TransactionServiceTest.cs
@@ -16,8 +16,10 @@ public class TransactionServiceTest : BaseStripeTest
         private readonly TransactionUpdateOptions updateOptions;
         private readonly TransactionListOptions listOptions;
 
-        public TransactionServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public TransactionServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new TransactionService();
 
diff --git a/src/StripeTests/Services/LoginLinks/LoginLinkServiceTest.cs b/src/StripeTests/Services/LoginLinks/LoginLinkServiceTest.cs
index ef69233cc4..631e88cf51 100644
--- a/src/StripeTests/Services/LoginLinks/LoginLinkServiceTest.cs
+++ b/src/StripeTests/Services/LoginLinks/LoginLinkServiceTest.cs
@@ -14,8 +14,10 @@ public class LoginLinkServiceTest : BaseStripeTest
         private readonly LoginLinkService service;
         private readonly LoginLinkCreateOptions createOptions;
 
-        public LoginLinkServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public LoginLinkServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new LoginLinkService();
 
diff --git a/src/StripeTests/Services/OAuth/OAuthTokenServiceTest.cs b/src/StripeTests/Services/OAuth/OAuthTokenServiceTest.cs
index 28ef7c37c9..55b26ba0eb 100644
--- a/src/StripeTests/Services/OAuth/OAuthTokenServiceTest.cs
+++ b/src/StripeTests/Services/OAuth/OAuthTokenServiceTest.cs
@@ -19,8 +19,10 @@ public class OAuthTokenServiceTest : BaseStripeTest
         private readonly OAuthTokenCreateOptions createOptions;
         private readonly OAuthDeauthorizeOptions deauthorizeOptions;
 
-        public OAuthTokenServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public OAuthTokenServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new OAuthTokenService();
 
diff --git a/src/StripeTests/Services/Orders/OrderServiceTest.cs b/src/StripeTests/Services/Orders/OrderServiceTest.cs
index aaed4008af..136b533d0c 100644
--- a/src/StripeTests/Services/Orders/OrderServiceTest.cs
+++ b/src/StripeTests/Services/Orders/OrderServiceTest.cs
@@ -18,8 +18,10 @@ public class OrderServiceTest : BaseStripeTest
         private readonly OrderPayOptions payOptions;
         private readonly OrderListOptions listOptions;
 
-        public OrderServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public OrderServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new OrderService();
 
diff --git a/src/StripeTests/Services/PaymentIntents/PaymentIntentServiceTest.cs b/src/StripeTests/Services/PaymentIntents/PaymentIntentServiceTest.cs
index 39497e332c..9c0c1b386d 100644
--- a/src/StripeTests/Services/PaymentIntents/PaymentIntentServiceTest.cs
+++ b/src/StripeTests/Services/PaymentIntents/PaymentIntentServiceTest.cs
@@ -20,8 +20,10 @@ public class PaymentIntentServiceTest : BaseStripeTest
         private readonly PaymentIntentListOptions listOptions;
         private readonly PaymentIntentUpdateOptions updateOptions;
 
-        public PaymentIntentServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public PaymentIntentServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new PaymentIntentService();
 
diff --git a/src/StripeTests/Services/PaymentMethods/PaymentMethodServiceTest.cs b/src/StripeTests/Services/PaymentMethods/PaymentMethodServiceTest.cs
index 66db7b14d2..ddcdc9243b 100644
--- a/src/StripeTests/Services/PaymentMethods/PaymentMethodServiceTest.cs
+++ b/src/StripeTests/Services/PaymentMethods/PaymentMethodServiceTest.cs
@@ -19,8 +19,10 @@ public class PaymentMethodServiceTest : BaseStripeTest
         private readonly PaymentMethodListOptions listOptions;
         private readonly PaymentMethodUpdateOptions updateOptions;
 
-        public PaymentMethodServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public PaymentMethodServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new PaymentMethodService();
 
diff --git a/src/StripeTests/Services/Payouts/PayoutServiceTest.cs b/src/StripeTests/Services/Payouts/PayoutServiceTest.cs
index 48873ae712..779cd87577 100644
--- a/src/StripeTests/Services/Payouts/PayoutServiceTest.cs
+++ b/src/StripeTests/Services/Payouts/PayoutServiceTest.cs
@@ -17,8 +17,10 @@ public class PayoutServiceTest : BaseStripeTest
         private readonly PayoutUpdateOptions updateOptions;
         private readonly PayoutListOptions listOptions;
 
-        public PayoutServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public PayoutServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new PayoutService();
 
diff --git a/src/StripeTests/Services/Persons/PersonServiceTest.cs b/src/StripeTests/Services/Persons/PersonServiceTest.cs
index d9e524e8f1..a44591129c 100644
--- a/src/StripeTests/Services/Persons/PersonServiceTest.cs
+++ b/src/StripeTests/Services/Persons/PersonServiceTest.cs
@@ -17,8 +17,10 @@ public class PersonServiceTest : BaseStripeTest
         private readonly PersonUpdateOptions updateOptions;
         private readonly PersonListOptions listOptions;
 
-        public PersonServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public PersonServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new PersonService();
 
diff --git a/src/StripeTests/Services/Plans/PlanServiceTest.cs b/src/StripeTests/Services/Plans/PlanServiceTest.cs
index c14de58ed9..3706bc8e11 100644
--- a/src/StripeTests/Services/Plans/PlanServiceTest.cs
+++ b/src/StripeTests/Services/Plans/PlanServiceTest.cs
@@ -17,8 +17,10 @@ public class PlanServiceTest : BaseStripeTest
         private readonly PlanUpdateOptions updateOptions;
         private readonly PlanListOptions listOptions;
 
-        public PlanServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public PlanServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new PlanService();
 
diff --git a/src/StripeTests/Services/Products/ProductServiceTest.cs b/src/StripeTests/Services/Products/ProductServiceTest.cs
index 790b1f6f0b..d2c9e4100c 100644
--- a/src/StripeTests/Services/Products/ProductServiceTest.cs
+++ b/src/StripeTests/Services/Products/ProductServiceTest.cs
@@ -17,8 +17,10 @@ public class ProductServiceTest : BaseStripeTest
         private readonly ProductUpdateOptions updateOptions;
         private readonly ProductListOptions listOptions;
 
-        public ProductServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ProductServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ProductService();
 
diff --git a/src/StripeTests/Services/Radar/EarlyFraudWarnings/EarlyFraudWarningServiceTest.cs b/src/StripeTests/Services/Radar/EarlyFraudWarnings/EarlyFraudWarningServiceTest.cs
index f388df2bff..1aebeca9e1 100644
--- a/src/StripeTests/Services/Radar/EarlyFraudWarnings/EarlyFraudWarningServiceTest.cs
+++ b/src/StripeTests/Services/Radar/EarlyFraudWarnings/EarlyFraudWarningServiceTest.cs
@@ -15,8 +15,10 @@ public class EarlyFraudWarningServiceTest : BaseStripeTest
         private readonly EarlyFraudWarningService service;
         private readonly EarlyFraudWarningListOptions listOptions;
 
-        public EarlyFraudWarningServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public EarlyFraudWarningServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new EarlyFraudWarningService();
 
diff --git a/src/StripeTests/Services/Radar/ValueListItems/ValueListItemServiceTest.cs b/src/StripeTests/Services/Radar/ValueListItems/ValueListItemServiceTest.cs
index bdc69d5515..bca2f57ccb 100644
--- a/src/StripeTests/Services/Radar/ValueListItems/ValueListItemServiceTest.cs
+++ b/src/StripeTests/Services/Radar/ValueListItems/ValueListItemServiceTest.cs
@@ -15,8 +15,10 @@ public class ValueListItemServiceTest : BaseStripeTest
         private readonly ValueListItemCreateOptions createOptions;
         private readonly ValueListItemListOptions listOptions;
 
-        public ValueListItemServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ValueListItemServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ValueListItemService();
 
diff --git a/src/StripeTests/Services/Radar/ValueLists/ValueListServiceTest.cs b/src/StripeTests/Services/Radar/ValueLists/ValueListServiceTest.cs
index a740c2993a..f1ce9a55c3 100644
--- a/src/StripeTests/Services/Radar/ValueLists/ValueListServiceTest.cs
+++ b/src/StripeTests/Services/Radar/ValueLists/ValueListServiceTest.cs
@@ -17,8 +17,10 @@ public class ValueListServiceTest : BaseStripeTest
         private readonly ValueListUpdateOptions updateOptions;
         private readonly ValueListListOptions listOptions;
 
-        public ValueListServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ValueListServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ValueListService();
 
diff --git a/src/StripeTests/Services/Refunds/RefundServiceTest.cs b/src/StripeTests/Services/Refunds/RefundServiceTest.cs
index 5fddc51f93..50a5a1a9d9 100644
--- a/src/StripeTests/Services/Refunds/RefundServiceTest.cs
+++ b/src/StripeTests/Services/Refunds/RefundServiceTest.cs
@@ -17,9 +17,11 @@ public class RefundServiceTest : BaseStripeTest
         private readonly RefundUpdateOptions updateOptions;
         private readonly RefundListOptions listOptions;
 
-        public RefundServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
-        {
+        public RefundServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
+       {
             this.service = new RefundService();
 
             this.createOptions = new RefundCreateOptions
diff --git a/src/StripeTests/Services/Reporting/ReportRuns/ReportRunServiceTest.cs b/src/StripeTests/Services/Reporting/ReportRuns/ReportRunServiceTest.cs
index 20fa1b24b4..af8a33633a 100644
--- a/src/StripeTests/Services/Reporting/ReportRuns/ReportRunServiceTest.cs
+++ b/src/StripeTests/Services/Reporting/ReportRuns/ReportRunServiceTest.cs
@@ -16,9 +16,11 @@ public class ReportRunServiceTest : BaseStripeTest
         private readonly ReportRunCreateOptions createOptions;
         private readonly ReportRunListOptions listOptions;
 
-        public ReportRunServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
-        {
+        public ReportRunServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
+       {
             this.service = new ReportRunService();
 
             this.createOptions = new ReportRunCreateOptions
diff --git a/src/StripeTests/Services/Reporting/ReportTypes/ReportTypeServiceTest.cs b/src/StripeTests/Services/Reporting/ReportTypes/ReportTypeServiceTest.cs
index 35218b313b..67de83d195 100644
--- a/src/StripeTests/Services/Reporting/ReportTypes/ReportTypeServiceTest.cs
+++ b/src/StripeTests/Services/Reporting/ReportTypes/ReportTypeServiceTest.cs
@@ -14,8 +14,10 @@ public class ReportTypeServiceTest : BaseStripeTest
         private readonly ReportTypeService service;
         private readonly ReportTypeListOptions listOptions;
 
-        public ReportTypeServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ReportTypeServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ReportTypeService();
 
diff --git a/src/StripeTests/Services/Reviews/ReviewServiceTest.cs b/src/StripeTests/Services/Reviews/ReviewServiceTest.cs
index 19e2b0df65..38f2c6bc59 100644
--- a/src/StripeTests/Services/Reviews/ReviewServiceTest.cs
+++ b/src/StripeTests/Services/Reviews/ReviewServiceTest.cs
@@ -15,8 +15,10 @@ public class ReviewServiceTest : BaseStripeTest
         private readonly ReviewApproveOptions approveOptions;
         private readonly ReviewListOptions listOptions;
 
-        public ReviewServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ReviewServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ReviewService();
 
diff --git a/src/StripeTests/Services/Sigma/ScheduledQueryRuns/ScheduledQueryRunServiceTest.cs b/src/StripeTests/Services/Sigma/ScheduledQueryRuns/ScheduledQueryRunServiceTest.cs
index 91158e8cae..c1b4aab52e 100644
--- a/src/StripeTests/Services/Sigma/ScheduledQueryRuns/ScheduledQueryRunServiceTest.cs
+++ b/src/StripeTests/Services/Sigma/ScheduledQueryRuns/ScheduledQueryRunServiceTest.cs
@@ -14,8 +14,10 @@ public class ScheduledQueryRunServiceTest : BaseStripeTest
         private readonly ScheduledQueryRunService service;
         private readonly ScheduledQueryRunListOptions listOptions;
 
-        public ScheduledQueryRunServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ScheduledQueryRunServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ScheduledQueryRunService();
 
diff --git a/src/StripeTests/Services/Skus/SkuServiceTest.cs b/src/StripeTests/Services/Skus/SkuServiceTest.cs
index e5ae2d7a6a..df5e263716 100644
--- a/src/StripeTests/Services/Skus/SkuServiceTest.cs
+++ b/src/StripeTests/Services/Skus/SkuServiceTest.cs
@@ -17,8 +17,10 @@ public class SkuServiceTest : BaseStripeTest
         private readonly SkuUpdateOptions updateOptions;
         private readonly SkuListOptions listOptions;
 
-        public SkuServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public SkuServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new SkuService();
 
diff --git a/src/StripeTests/Services/SourceTransactions/SourceTransactionServiceTest.cs b/src/StripeTests/Services/SourceTransactions/SourceTransactionServiceTest.cs
index 9ec91957d0..963b6c11fd 100644
--- a/src/StripeTests/Services/SourceTransactions/SourceTransactionServiceTest.cs
+++ b/src/StripeTests/Services/SourceTransactions/SourceTransactionServiceTest.cs
@@ -14,8 +14,10 @@ public class SourceTransactionServiceTest : BaseStripeTest
         private readonly SourceTransactionService service;
         private readonly SourceTransactionsListOptions listOptions;
 
-        public SourceTransactionServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public SourceTransactionServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new SourceTransactionService();
 
diff --git a/src/StripeTests/Services/Sources/SourceServiceTest.cs b/src/StripeTests/Services/Sources/SourceServiceTest.cs
index 16cc4df526..ce2af05e38 100644
--- a/src/StripeTests/Services/Sources/SourceServiceTest.cs
+++ b/src/StripeTests/Services/Sources/SourceServiceTest.cs
@@ -21,8 +21,10 @@ public class SourceServiceTest : BaseStripeTest
         private readonly SourceUpdateOptions updateOptions;
         private readonly SourceVerifyOptions verifyOptions;
 
-        public SourceServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public SourceServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new SourceService();
 
diff --git a/src/StripeTests/Services/SubscriptionItems/SubscriptionItemServiceTest.cs b/src/StripeTests/Services/SubscriptionItems/SubscriptionItemServiceTest.cs
index 88bd733dbe..18d58ba61a 100644
--- a/src/StripeTests/Services/SubscriptionItems/SubscriptionItemServiceTest.cs
+++ b/src/StripeTests/Services/SubscriptionItems/SubscriptionItemServiceTest.cs
@@ -17,8 +17,10 @@ public class SubscriptionItemServiceTest : BaseStripeTest
         private readonly SubscriptionItemUpdateOptions updateOptions;
         private readonly SubscriptionItemListOptions listOptions;
 
-        public SubscriptionItemServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public SubscriptionItemServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new SubscriptionItemService();
 
diff --git a/src/StripeTests/Services/SubscriptionScheduleRevisions.cs/SubscriptionScheduleRevisionServiceTest.cs b/src/StripeTests/Services/SubscriptionScheduleRevisions.cs/SubscriptionScheduleRevisionServiceTest.cs
index 892881895f..ea3bfc1339 100644
--- a/src/StripeTests/Services/SubscriptionScheduleRevisions.cs/SubscriptionScheduleRevisionServiceTest.cs
+++ b/src/StripeTests/Services/SubscriptionScheduleRevisions.cs/SubscriptionScheduleRevisionServiceTest.cs
@@ -15,8 +15,10 @@ public class SubscriptionScheduleRevisionServiceTest : BaseStripeTest
         private readonly SubscriptionScheduleRevisionService service;
         private readonly SubscriptionScheduleRevisionListOptions listOptions;
 
-        public SubscriptionScheduleRevisionServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public SubscriptionScheduleRevisionServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new SubscriptionScheduleRevisionService();
 
diff --git a/src/StripeTests/Services/SubscriptionSchedules/SubscriptionScheduleServiceTest.cs b/src/StripeTests/Services/SubscriptionSchedules/SubscriptionScheduleServiceTest.cs
index 5962104942..23d1c18f5f 100644
--- a/src/StripeTests/Services/SubscriptionSchedules/SubscriptionScheduleServiceTest.cs
+++ b/src/StripeTests/Services/SubscriptionSchedules/SubscriptionScheduleServiceTest.cs
@@ -19,8 +19,10 @@ public class SubscriptionScheduleServiceTest : BaseStripeTest
         private readonly SubscriptionScheduleReleaseOptions releaseOptions;
         private readonly SubscriptionScheduleUpdateOptions updateOptions;
 
-        public SubscriptionScheduleServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public SubscriptionScheduleServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new SubscriptionScheduleService();
 
diff --git a/src/StripeTests/Services/Subscriptions/SubscriptionServiceTest.cs b/src/StripeTests/Services/Subscriptions/SubscriptionServiceTest.cs
index 3f0af02018..9af67845c2 100644
--- a/src/StripeTests/Services/Subscriptions/SubscriptionServiceTest.cs
+++ b/src/StripeTests/Services/Subscriptions/SubscriptionServiceTest.cs
@@ -18,8 +18,10 @@ public class SubscriptionServiceTest : BaseStripeTest
         private readonly SubscriptionUpdateOptions updateOptions;
         private readonly SubscriptionListOptions listOptions;
 
-        public SubscriptionServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public SubscriptionServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new SubscriptionService();
 
diff --git a/src/StripeTests/Services/TaxIds/TaxIdServiceTest.cs b/src/StripeTests/Services/TaxIds/TaxIdServiceTest.cs
index fa00a5853a..0e46ea8ff6 100644
--- a/src/StripeTests/Services/TaxIds/TaxIdServiceTest.cs
+++ b/src/StripeTests/Services/TaxIds/TaxIdServiceTest.cs
@@ -16,8 +16,10 @@ public class TaxIdServiceTest : BaseStripeTest
         private readonly TaxIdCreateOptions createOptions;
         private readonly TaxIdListOptions listOptions;
 
-        public TaxIdServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public TaxIdServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new TaxIdService();
 
diff --git a/src/StripeTests/Services/TaxRates/TaxRateServiceTest.cs b/src/StripeTests/Services/TaxRates/TaxRateServiceTest.cs
index 5ac76b4293..bb68163db0 100644
--- a/src/StripeTests/Services/TaxRates/TaxRateServiceTest.cs
+++ b/src/StripeTests/Services/TaxRates/TaxRateServiceTest.cs
@@ -17,8 +17,10 @@ public class TaxRateServiceTest : BaseStripeTest
         private readonly TaxRateUpdateOptions updateOptions;
         private readonly TaxRateListOptions listOptions;
 
-        public TaxRateServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public TaxRateServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new TaxRateService();
 
diff --git a/src/StripeTests/Services/Terminal/ConnectionTokens/ConnectionTokenServiceTest.cs b/src/StripeTests/Services/Terminal/ConnectionTokens/ConnectionTokenServiceTest.cs
index ceb7a2623a..438586b2f6 100644
--- a/src/StripeTests/Services/Terminal/ConnectionTokens/ConnectionTokenServiceTest.cs
+++ b/src/StripeTests/Services/Terminal/ConnectionTokens/ConnectionTokenServiceTest.cs
@@ -13,8 +13,10 @@ public class ConnectionTokenServiceTest : BaseStripeTest
         private readonly ConnectionTokenService service;
         private readonly ConnectionTokenCreateOptions createOptions;
 
-        public ConnectionTokenServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ConnectionTokenServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ConnectionTokenService();
 
diff --git a/src/StripeTests/Services/Terminal/Locations/LocationServiceTest.cs b/src/StripeTests/Services/Terminal/Locations/LocationServiceTest.cs
index 63c3bbf2d2..32911b2f8c 100644
--- a/src/StripeTests/Services/Terminal/Locations/LocationServiceTest.cs
+++ b/src/StripeTests/Services/Terminal/Locations/LocationServiceTest.cs
@@ -18,8 +18,10 @@ public class LocationServiceTest : BaseStripeTest
         private readonly LocationListOptions listOptions;
         private readonly LocationUpdateOptions updateOptions;
 
-        public LocationServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public LocationServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new LocationService();
 
diff --git a/src/StripeTests/Services/Terminal/Readers/ReaderServiceTest.cs b/src/StripeTests/Services/Terminal/Readers/ReaderServiceTest.cs
index 9e08ee560f..b18531e539 100644
--- a/src/StripeTests/Services/Terminal/Readers/ReaderServiceTest.cs
+++ b/src/StripeTests/Services/Terminal/Readers/ReaderServiceTest.cs
@@ -17,8 +17,10 @@ public class ReaderServiceTest : BaseStripeTest
         private readonly ReaderListOptions listOptions;
         private readonly ReaderUpdateOptions updateOptions;
 
-        public ReaderServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ReaderServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ReaderService();
 
diff --git a/src/StripeTests/Services/ThreeDSecure/ThreeDSecureServiceTest.cs b/src/StripeTests/Services/ThreeDSecure/ThreeDSecureServiceTest.cs
index 920942a569..56dde62fde 100644
--- a/src/StripeTests/Services/ThreeDSecure/ThreeDSecureServiceTest.cs
+++ b/src/StripeTests/Services/ThreeDSecure/ThreeDSecureServiceTest.cs
@@ -12,8 +12,10 @@ public class ThreeDSecureServiceTest : BaseStripeTest
         private readonly ThreeDSecureService service;
         private readonly ThreeDSecureCreateOptions createOptions;
 
-        public ThreeDSecureServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public ThreeDSecureServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new ThreeDSecureService();
 
diff --git a/src/StripeTests/Services/Tokens/TokenServiceTest.cs b/src/StripeTests/Services/Tokens/TokenServiceTest.cs
index 237fac5dcf..d823451b0c 100644
--- a/src/StripeTests/Services/Tokens/TokenServiceTest.cs
+++ b/src/StripeTests/Services/Tokens/TokenServiceTest.cs
@@ -15,8 +15,10 @@ public class TokenServiceTest : BaseStripeTest
         private readonly TokenService service;
         private readonly TokenCreateOptions createOptions;
 
-        public TokenServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public TokenServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new TokenService();
 
diff --git a/src/StripeTests/Services/Topups/TopupServiceTest.cs b/src/StripeTests/Services/Topups/TopupServiceTest.cs
index ea9e5bf789..a1774bda34 100644
--- a/src/StripeTests/Services/Topups/TopupServiceTest.cs
+++ b/src/StripeTests/Services/Topups/TopupServiceTest.cs
@@ -17,8 +17,10 @@ public class TopupServiceTest : BaseStripeTest
         private readonly TopupUpdateOptions updateOptions;
         private readonly TopupListOptions listOptions;
 
-        public TopupServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public TopupServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new TopupService();
 
diff --git a/src/StripeTests/Services/TransferReversals/TransferReversalServiceTest.cs b/src/StripeTests/Services/TransferReversals/TransferReversalServiceTest.cs
index abf3ca655d..c9a83e4a19 100644
--- a/src/StripeTests/Services/TransferReversals/TransferReversalServiceTest.cs
+++ b/src/StripeTests/Services/TransferReversals/TransferReversalServiceTest.cs
@@ -18,8 +18,10 @@ public class TransferReversalServiceTest : BaseStripeTest
         private readonly TransferReversalUpdateOptions updateOptions;
         private readonly TransferReversalListOptions listOptions;
 
-        public TransferReversalServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public TransferReversalServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new TransferReversalService();
 
diff --git a/src/StripeTests/Services/Transfers/TransferServiceTest.cs b/src/StripeTests/Services/Transfers/TransferServiceTest.cs
index e252e1391c..4cd7e03ad2 100644
--- a/src/StripeTests/Services/Transfers/TransferServiceTest.cs
+++ b/src/StripeTests/Services/Transfers/TransferServiceTest.cs
@@ -17,8 +17,10 @@ public class TransferServiceTest : BaseStripeTest
         private readonly TransferUpdateOptions updateOptions;
         private readonly TransferListOptions listOptions;
 
-        public TransferServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public TransferServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new TransferService();
 
diff --git a/src/StripeTests/Services/UsageRecordSummaries/UsageRecordSummaryServiceTest.cs b/src/StripeTests/Services/UsageRecordSummaries/UsageRecordSummaryServiceTest.cs
index 76ea3fa199..8851a9be68 100644
--- a/src/StripeTests/Services/UsageRecordSummaries/UsageRecordSummaryServiceTest.cs
+++ b/src/StripeTests/Services/UsageRecordSummaries/UsageRecordSummaryServiceTest.cs
@@ -13,8 +13,10 @@ public class UsageRecordSummaryServiceTest : BaseStripeTest
         private readonly UsageRecordSummaryService service;
         private readonly UsageRecordSummaryListOptions listOptions;
 
-        public UsageRecordSummaryServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public UsageRecordSummaryServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new UsageRecordSummaryService();
 
diff --git a/src/StripeTests/Services/UsageRecords/UsageRecordServiceTest.cs b/src/StripeTests/Services/UsageRecords/UsageRecordServiceTest.cs
index c8126a4910..ce9c9da515 100644
--- a/src/StripeTests/Services/UsageRecords/UsageRecordServiceTest.cs
+++ b/src/StripeTests/Services/UsageRecords/UsageRecordServiceTest.cs
@@ -13,8 +13,10 @@ public class UsageRecordServiceTest : BaseStripeTest
         private readonly UsageRecordService service;
         private readonly UsageRecordCreateOptions createOptions;
 
-        public UsageRecordServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public UsageRecordServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new UsageRecordService();
 
diff --git a/src/StripeTests/Services/WebhookEndpoints/WebhookEndpointServiceTest.cs b/src/StripeTests/Services/WebhookEndpoints/WebhookEndpointServiceTest.cs
index 986297fd2f..ada3afdc94 100644
--- a/src/StripeTests/Services/WebhookEndpoints/WebhookEndpointServiceTest.cs
+++ b/src/StripeTests/Services/WebhookEndpoints/WebhookEndpointServiceTest.cs
@@ -17,8 +17,10 @@ public class WebhookEndpointServiceTest : BaseStripeTest
         private readonly WebhookEndpointUpdateOptions updateOptions;
         private readonly WebhookEndpointListOptions listOptions;
 
-        public WebhookEndpointServiceTest(MockHttpClientFixture mockHttpClientFixture)
-            : base(mockHttpClientFixture)
+        public WebhookEndpointServiceTest(
+            StripeMockFixture stripeMockFixture,
+            MockHttpClientFixture mockHttpClientFixture)
+            : base(stripeMockFixture, mockHttpClientFixture)
         {
             this.service = new WebhookEndpointService();
 
diff --git a/src/StripeTests/StripeMockFixture.cs b/src/StripeTests/StripeMockFixture.cs
index 6826de0618..149a4c5632 100644
--- a/src/StripeTests/StripeMockFixture.cs
+++ b/src/StripeTests/StripeMockFixture.cs
@@ -55,6 +55,19 @@ public void Dispose()
             StripeMockHandler.StopStripeMock();
         }
 
+        /// <summary>
+        /// Creates and returns a new instance of <see cref="StripeClient"/> suitable for use with
+        /// stripe-mock.
+        /// </summary>
+        /// <param name="httpClient">
+        /// The <see cref="IHttpClient"/> client to use. If <c>null</c>, an HTTP client will be
+        /// created with default parameters.
+        /// </param>
+        public StripeClient BuildStripeClient(IHttpClient httpClient = null)
+        {
+            return new StripeClient(httpClient: httpClient);
+        }
+
         /// <summary>
         /// Gets fixture data with expansions specified. Expansions are specified the same way as
         /// they are in the normal API like <c>customer</c> or <c>data.customer</c>.