diff --git a/src/Session.Tests/MongoSessionProviderTests.cs b/src/Session.Tests/MongoSessionProviderTests.cs
index 4a0aa0d..e6f30d8 100644
--- a/src/Session.Tests/MongoSessionProviderTests.cs
+++ b/src/Session.Tests/MongoSessionProviderTests.cs
@@ -25,7 +25,8 @@ public MongoSessionProviderTests(MongoReplicaSetResource mongoResource)
 
         _serviceProvider = new ServiceCollection()
             .AddSingleton(mongoOptions)
-            .AddMongoSessionProvider<TestDbContext, ITestScope>()
+            .AddSingleton<ITestDbContext, TestDbContext>()
+            .AddSingleton<ITestSessionProvider, TestSessionProvider>()
             .BuildServiceProvider();
     }
 
@@ -33,8 +34,8 @@ public MongoSessionProviderTests(MongoReplicaSetResource mongoResource)
     public async Task BeginTransactionAsync_ShouldBeginTransaction()
     {
         // Arrange
-        ISessionProvider<ITestScope> sessionProvider = _serviceProvider
-            .GetRequiredService<ISessionProvider<ITestScope>>();
+        ITestSessionProvider sessionProvider = _serviceProvider
+            .GetRequiredService<ITestSessionProvider>();
 
         // Act
         ITransactionSession transactionSession = await sessionProvider
@@ -51,8 +52,8 @@ public async Task BeginTransactionAsync_ShouldBeginTransaction()
     public async Task StartSessionAsync_ShouldStartSession()
     {
         // Arrange
-        ISessionProvider<ITestScope> sessionProvider = _serviceProvider
-            .GetRequiredService<ISessionProvider<ITestScope>>();
+        ITestSessionProvider sessionProvider = _serviceProvider
+            .GetRequiredService<ITestSessionProvider>();
 
         // Act
         ISession session = await sessionProvider
@@ -69,8 +70,8 @@ public async Task StartSessionAsync_ShouldStartSession()
     public async Task MongoSession_Dispose_ShouldDisposeSession()
     {
         // Arrange
-        ISessionProvider<ITestScope> sessionProvider = _serviceProvider
-            .GetRequiredService<ISessionProvider<ITestScope>>();
+        ITestSessionProvider sessionProvider = _serviceProvider
+            .GetRequiredService<ITestSessionProvider>();
 
         ISession session = await sessionProvider
             .StartSessionAsync(CancellationToken.None);
@@ -87,8 +88,8 @@ public async Task MongoSession_Dispose_ShouldDisposeSession()
     public async Task MongoTransactionSession_Dispose_ShouldDisposeSession()
     {
         // Arrange
-        ISessionProvider<ITestScope> sessionProvider = _serviceProvider
-            .GetRequiredService<ISessionProvider<ITestScope>>();
+        ITestSessionProvider sessionProvider = _serviceProvider
+            .GetRequiredService<ITestSessionProvider>();
 
         ITransactionSession transactionSession = await sessionProvider
             .BeginTransactionAsync(CancellationToken.None);
@@ -105,13 +106,13 @@ public async Task MongoTransactionSession_Dispose_ShouldDisposeSession()
     public async Task MongoTransactionSession_NotCommitting_ShouldNotAffectDatabase()
     {
         // Arrange
-        ISessionProvider<ITestScope> sessionProvider = _serviceProvider
-            .GetRequiredService<ISessionProvider<ITestScope>>();
+        ITestSessionProvider sessionProvider = _serviceProvider
+            .GetRequiredService<ITestSessionProvider>();
 
         ITransactionSession transactionSession = await sessionProvider
             .BeginTransactionAsync(CancellationToken.None);
-        TestDbContext context = _serviceProvider.GetRequiredService<TestDbContext>();
-        IMongoCollection<BsonDocument> collection = context.CreateCollection<BsonDocument>();
+        var context = _serviceProvider.GetRequiredService<ITestDbContext>();
+        var collection = context.CreateCollection<BsonDocument>();
         await collection.InsertOneAsync(transactionSession.GetSessionHandle(), new BsonDocument());
 
         // Act
@@ -124,7 +125,9 @@ public async Task MongoTransactionSession_NotCommitting_ShouldNotAffectDatabase(
             .Count.Should().Be(0);
     }
 
-    private class TestDbContext : MongoDbContext
+    private interface ITestDbContext : IMongoDbContext { }
+
+    private class TestDbContext : MongoDbContext, ITestDbContext
     {
         public TestDbContext(MongoOptions mongoOptions)
             : base(mongoOptions)
@@ -136,7 +139,13 @@ protected override void OnConfiguring(IMongoDatabaseBuilder mongoDatabaseBuilder
         }
     }
 
-    private interface ITestScope
+    private interface ITestSessionProvider : ISessionProvider<ITestDbContext> { }
+
+    private class TestSessionProvider : MongoSessionProvider<ITestDbContext>, ITestSessionProvider
     {
+        public TestSessionProvider(ITestDbContext context)
+            : base(context)
+        {
+        }
     }
 }