diff --git a/test/EFCore.Tests/Metadata/Conventions/ServicePropertyDiscoveryConventionTest.cs b/test/EFCore.Tests/Metadata/Conventions/ServicePropertyDiscoveryConventionTest.cs
index c74015a1bad..5e1d009f1c1 100644
--- a/test/EFCore.Tests/Metadata/Conventions/ServicePropertyDiscoveryConventionTest.cs
+++ b/test/EFCore.Tests/Metadata/Conventions/ServicePropertyDiscoveryConventionTest.cs
@@ -192,8 +192,10 @@ private abstract class Blog
 
     private class ServicePropertiesContext : DbContext
     {
+        private static readonly InMemoryDatabaseRoot _databaseRoot = new();
+
         protected internal override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-            => optionsBuilder.UseInMemoryDatabase(GetType().Name);
+            => optionsBuilder.UseInMemoryDatabase(GetType().Name, _databaseRoot);
 
         public DbSet<PrivateUnmappedBaseSuper> PrivateUnmappedBaseSupers
             => Set<PrivateUnmappedBaseSuper>();
diff --git a/test/EFCore.Tests/ServiceProviderCacheTest.cs b/test/EFCore.Tests/ServiceProviderCacheTest.cs
index d2cac086b41..ce1c3877cfe 100644
--- a/test/EFCore.Tests/ServiceProviderCacheTest.cs
+++ b/test/EFCore.Tests/ServiceProviderCacheTest.cs
@@ -332,7 +332,7 @@ public override void PopulateDebugInfo(IDictionary<string, string> debugInfo)
     [ConditionalFact]
     public void Service_provider_cache_can_be_cleared()
     {
-        var cache = ServiceProviderCache.Instance;
+        var cache = new ServiceProviderCache();
         var options = new DbContextOptionsBuilder().UseInMemoryDatabase("TestDB").Options;
 
         var provider1 = cache.GetOrAdd(options, providerRequired: false);