diff --git a/tests/Microsoft.Identity.Web.Test/AuthorityHelpersTests.cs b/tests/Microsoft.Identity.Web.Test/AuthorityHelpersTests.cs
index 13a909cff..e511171c5 100644
--- a/tests/Microsoft.Identity.Web.Test/AuthorityHelpersTests.cs
+++ b/tests/Microsoft.Identity.Web.Test/AuthorityHelpersTests.cs
@@ -120,9 +120,9 @@ public void EnsureAuthorityIsV2(string initialAuthority, string expectedAuthorit
         }
 
         [Theory]
-        [MemberData(nameof(GetAuthorityWithoutQueryIfNeededTheoryData))]
-        [MemberData(nameof(GetAuthorityWithoutQueryIfNeededExistingValuesTheoryData))]
-        [MemberData(nameof(GetAuthorityWithoutQueryIfNeededOverlappingExistingValuesTheoryData))]
+        [MemberData(nameof(GetAuthorityWithoutQueryIfNeededTheoryData), DisableDiscoveryEnumeration = true)]
+        [MemberData(nameof(GetAuthorityWithoutQueryIfNeededExistingValuesTheoryData), DisableDiscoveryEnumeration = true)]
+        [MemberData(nameof(GetAuthorityWithoutQueryIfNeededOverlappingExistingValuesTheoryData), DisableDiscoveryEnumeration = true)]
         public void GetAuthorityWithoutQueryIfNeeded(AuthorityHelpersTheoryData theoryData)
         {
             // arrange
diff --git a/tests/Microsoft.Identity.Web.Test/MsalTokenCacheProviderTests.cs b/tests/Microsoft.Identity.Web.Test/MsalTokenCacheProviderTests.cs
index 5efac8278..3468b9ba3 100644
--- a/tests/Microsoft.Identity.Web.Test/MsalTokenCacheProviderTests.cs
+++ b/tests/Microsoft.Identity.Web.Test/MsalTokenCacheProviderTests.cs
@@ -22,7 +22,7 @@ public void CreateTokenCacheSerializerTest()
             Assert.NotNull(tokenCacheProvider);
         }
 
-        [Theory, MemberData(nameof(CacheExpiryData))]
+        [Theory, MemberData(nameof(CacheExpiryData), DisableDiscoveryEnumeration = true)]
         public void CacheEntryExpiry_SetCorrectly_Test(TimeSpan? optionsCacheExpiry, DateTimeOffset? suggestedCacheExpiry, TimeSpan expectedCacheExpiry)
         {
             // Arrange