diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
index 06ed98846d..02dd0e5de7 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
@@ -111,6 +111,8 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
                     entity,
                     cancellationToken: GetCancellationToken(cancellationToken)
                 );
+
+
             }
             else
             {
@@ -248,9 +250,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
 
         public virtual IMongoQueryable<TEntity> GetMongoQueryable()
         {
-            return ApplyDataFilters(
-                Collection.AsQueryable()
-            );
+            return ApplyDataFilters(SessionHandle != null ? Collection.AsQueryable(SessionHandle) : Collection.AsQueryable());
         }
         protected virtual bool IsHardDeleted(TEntity entity)
         {
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbContext.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbContext.cs
index 0dea1710d9..ab18d8cde6 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbContext.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbContext.cs
@@ -26,8 +26,6 @@ namespace Volo.Abp.MongoDB
 
         public virtual IMongoCollection<T> Collection<T>()
         {
-            CreateCollectionIfNotExists<T>();
-
             return Database.GetCollection<T>(GetCollectionName<T>());
         }
 
@@ -47,23 +45,5 @@ namespace Volo.Abp.MongoDB
 
             return model;
         }
-
-        protected virtual void CreateCollectionIfNotExists<T>()
-        {
-            var collectionName = GetCollectionName<T>();
-
-            if (!CollectionExists(collectionName))
-            {
-                Database.CreateCollection(collectionName);
-            }
-        }
-
-        protected virtual bool CollectionExists(string collectionName)
-        {
-            var filter = new BsonDocument("name", collectionName);
-            var options = new ListCollectionNamesOptions { Filter = filter };
-
-            return Database.ListCollectionNames(options).Any();
-        }
     }
 }
diff --git a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoClientExtension.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoClientExtension.cs
similarity index 94%
rename from framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoClientExtension.cs
rename to framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoClientExtension.cs
index 8b7508dabf..f792f6c9a9 100644
--- a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoClientExtension.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoClientExtension.cs
@@ -7,7 +7,7 @@ namespace Volo.Abp.MongoDB
     /// <summary>
     /// TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
     /// </summary>
-     internal static class MongoClientExtension
+    public static class MongoClientExtension
     {
         private static readonly TimeSpan InitialDelay = TimeSpan.FromMilliseconds(500);
         private static readonly TimeSpan MaxDelay = TimeSpan.FromSeconds(5000);
@@ -37,9 +37,12 @@ namespace Volo.Abp.MongoDB
                         {
                             session.Dispose();
                         }
+
                         break;
                     }
-                    catch (NotSupportedException) { }
+                    catch (NotSupportedException)
+                    {
+                    }
 
                     Thread.Sleep(delay);
                     delay = Min(Double(delay), MaxDelay);
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelBuilder.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelBuilder.cs
index 43ffbabf4a..6d8706d7ee 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelBuilder.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelBuilder.cs
@@ -3,6 +3,8 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using MongoDB.Bson;
+using MongoDB.Driver;
 using Volo.Abp.Domain.Entities;
 
 namespace Volo.Abp.MongoDB
@@ -18,7 +20,7 @@ namespace Volo.Abp.MongoDB
             _entityModelBuilders = new Dictionary<Type, object>();
         }
 
-        public MongoDbContextModel Build()
+        public MongoDbContextModel Build(AbpMongoDbContext dbContext)
         {
             lock (SyncObj)
             {
@@ -38,6 +40,8 @@ namespace Volo.Abp.MongoDB
                     }
 
                     baseClasses.AddRange(entityModel.EntityType.GetBaseClasses(includeObject: false));
+
+                    CreateCollectionIfNotExists(dbContext, entityModel.CollectionName);
                 }
 
                 baseClasses = baseClasses.Distinct().ToList();
@@ -84,5 +88,16 @@ namespace Volo.Abp.MongoDB
         {
             return _entityModelBuilders.Values.Cast<IMongoEntityModel>().ToImmutableList();
         }
+
+        protected virtual void CreateCollectionIfNotExists(AbpMongoDbContext dbContext, string collectionName)
+        {
+            var filter = new BsonDocument("name", collectionName);
+            var options = new ListCollectionNamesOptions { Filter = filter };
+
+            if (!dbContext.Database.ListCollectionNames(options).Any())
+            {
+                dbContext.Database.CreateCollection(collectionName);
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelSource.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelSource.cs
index c5cb0da1c8..295cb8b84f 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelSource.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelSource.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.MongoDB
     public class MongoModelSource : IMongoModelSource, ISingletonDependency
     {
         protected readonly ConcurrentDictionary<Type, MongoDbContextModel> ModelCache = new ConcurrentDictionary<Type, MongoDbContextModel>();
-        
+
         public virtual MongoDbContextModel GetModel(AbpMongoDbContext dbContext)
         {
             return ModelCache.GetOrAdd(
@@ -26,7 +26,7 @@ namespace Volo.Abp.MongoDB
             var modelBuilder = CreateModelBuilder();
             BuildModelFromDbContextType(modelBuilder, dbContext.GetType());
             BuildModelFromDbContextInstance(modelBuilder, dbContext);
-            return modelBuilder.Build();
+            return modelBuilder.Build(dbContext);
         }
 
         protected virtual MongoModelBuilder CreateModelBuilder()
@@ -65,4 +65,4 @@ namespace Volo.Abp.MongoDB
             dbContext.CreateModel(modelBuilder);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoDbFixture.cs b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoDbFixture.cs
index dbb872bee6..a3c3b25cac 100644
--- a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoDbFixture.cs
+++ b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoDbFixture.cs
@@ -1,6 +1,7 @@
 using System;
 using Mongo2Go;
 using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.MongoDB
 {
diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs
index 5cac32faae..37d43e4ee5 100644
--- a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs
+++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs
@@ -12,9 +12,11 @@ namespace Volo.Abp.AuditLogging.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var stringArray = MongoDbFixture.ConnectionString.Split('?');
+
+            var connectionString = stringArray[0].EnsureEndsWith('/') +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
@@ -22,4 +24,4 @@ namespace Volo.Abp.AuditLogging.MongoDB
             });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/MongoDbFixture.cs b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/MongoDbFixture.cs
index e217faf961..8d928e9f1e 100644
--- a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/MongoDbFixture.cs
+++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.AuditLogging.MongoDB
 {
@@ -10,8 +12,12 @@ namespace Volo.Abp.AuditLogging.MongoDB
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            //TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs
index 07be76b792..17f561c086 100644
--- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs
+++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs
@@ -12,9 +12,11 @@ namespace Volo.Abp.BackgroundJobs.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
-                                   "Db_" +
-                                    Guid.NewGuid().ToString("N");
+            var stringArray = MongoDbFixture.ConnectionString.Split('?');
+
+                        var connectionString = stringArray[0].EnsureEndsWith('/') +
+                                               "Db_" +
+                                               Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
@@ -22,4 +24,4 @@ namespace Volo.Abp.BackgroundJobs.MongoDB
             });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/MongoDbFixture.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/MongoDbFixture.cs
index c358bed276..9e2f4a76a4 100644
--- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/MongoDbFixture.cs
+++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.BackgroundJobs.MongoDB
 {
@@ -10,8 +12,12 @@ namespace Volo.Abp.BackgroundJobs.MongoDB
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            //TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/BlobStoringDatabaseMongoDbTestModule.cs b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/BlobStoringDatabaseMongoDbTestModule.cs
index 03eb96f6d3..fa2e2f2936 100644
--- a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/BlobStoringDatabaseMongoDbTestModule.cs
+++ b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/BlobStoringDatabaseMongoDbTestModule.cs
@@ -12,9 +12,11 @@ namespace Volo.Abp.BlobStoring.Database.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var stringArray = MongoDbFixture.ConnectionString.Split('?');
+
+            var connectionString = stringArray[0].EnsureEndsWith('/') +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
@@ -22,4 +24,4 @@ namespace Volo.Abp.BlobStoring.Database.MongoDB
             });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/MongoDbFixture.cs
index a7cfb4f4b6..82335b13f3 100644
--- a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/MongoDbFixture.cs
+++ b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.BlobStoring.Database.MongoDB
 {
@@ -10,8 +12,12 @@ namespace Volo.Abp.BlobStoring.Database.MongoDB
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            //TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs b/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs
index 1e68cebf21..cac9cd748e 100644
--- a/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs
+++ b/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs
@@ -12,9 +12,11 @@ namespace Volo.Blogging.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var stringArray = MongoDbFixture.ConnectionString.Split('?');
+
+            var connectionString = stringArray[0].EnsureEndsWith('/') +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
diff --git a/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/MongoDbFixture.cs b/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/MongoDbFixture.cs
index 71824397b4..5198f4087d 100644
--- a/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/MongoDbFixture.cs
+++ b/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Blogging.MongoDB
 {
@@ -10,8 +12,12 @@ namespace Volo.Blogging.MongoDB
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            //TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/CmsKitMongoDbTestModule.cs b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/CmsKitMongoDbTestModule.cs
index 125ec8dbd4..38f0179093 100644
--- a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/CmsKitMongoDbTestModule.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/CmsKitMongoDbTestModule.cs
@@ -12,9 +12,11 @@ namespace Volo.CmsKit.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var stringArray = MongoDbFixture.ConnectionString.Split('?');
+
+            var connectionString = stringArray[0].EnsureEndsWith('/') +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
diff --git a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/MongoDbFixture.cs
index 3898749c10..e7c60b7d8d 100644
--- a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/MongoDbFixture.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.CmsKit.MongoDB
 {
@@ -10,8 +12,12 @@ namespace Volo.CmsKit.MongoDB
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            //TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs b/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs
index b31f9b5acd..942d19071c 100644
--- a/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs
+++ b/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs
@@ -12,9 +12,11 @@ namespace Volo.Docs.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var stringArray = MongoDbFixture.ConnectionString.Split('?');
+
+            var connectionString = stringArray[0].EnsureEndsWith('/') +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
diff --git a/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/MongoDbFixture.cs b/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/MongoDbFixture.cs
index 9a40d79492..90eab2fb2b 100644
--- a/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/MongoDbFixture.cs
+++ b/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Docs.MongoDB
 {
@@ -10,8 +12,12 @@ namespace Volo.Docs.MongoDB
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            //TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs
index 04d4ac916f..a1e24b829e 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs
@@ -12,9 +12,11 @@ namespace Volo.Abp.FeatureManagement.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var stringArray = MongoDbFixture.ConnectionString.Split('?');
+
+            var connectionString = stringArray[0].EnsureEndsWith('/') +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/MongoDbFixture.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/MongoDbFixture.cs
index bb89a83f76..32cfd0dc5f 100644
--- a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/MongoDbFixture.cs
+++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.FeatureManagement.MongoDB
 {
@@ -10,8 +12,12 @@ namespace Volo.Abp.FeatureManagement.MongoDB
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            //TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs b/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs
index f730e5f445..6cf462ccb9 100644
--- a/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs
+++ b/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs
@@ -2,6 +2,7 @@
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement.MongoDB;
+using Volo.Abp.Uow;
 
 namespace Volo.Abp.Identity.MongoDB
 {
@@ -14,14 +15,17 @@ namespace Volo.Abp.Identity.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var stringArray = MongoDbFixture.ConnectionString.Split('?');
+
+            var connectionString = stringArray[0].EnsureEndsWith('/') +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
                 options.ConnectionStrings.Default = connectionString;
             });
+
         }
     }
 }
diff --git a/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/MongoDbFixture.cs b/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/MongoDbFixture.cs
index 09581c13d5..4c919b6adc 100644
--- a/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/MongoDbFixture.cs
+++ b/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.Identity.MongoDB
 {
@@ -10,8 +12,12 @@ namespace Volo.Abp.Identity.MongoDB
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            //TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs b/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs
index d1721c720f..f9762d9d4a 100644
--- a/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs
+++ b/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs
@@ -16,9 +16,11 @@ namespace Volo.Abp.IdentityServer
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var stringArray = MongoDbFixture.ConnectionString.Split('?');
+
+            var connectionString = stringArray[0].EnsureEndsWith('/') +
                                    "Db_" +
-                                   Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/MongoDbFixture.cs b/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/MongoDbFixture.cs
index 2c2f120acd..f974990a54 100644
--- a/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/MongoDbFixture.cs
+++ b/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.IdentityServer
 {
@@ -10,8 +12,12 @@ namespace Volo.Abp.IdentityServer
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            //TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs b/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs
index 8e3c7b2c22..baa579403a 100644
--- a/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs
+++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs
@@ -11,9 +11,11 @@ namespace Volo.Abp.PermissionManagement.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
-                                    "Db_" +									
-                                    Guid.NewGuid().ToString("N");
+            var stringArray = MongoDbFixture.ConnectionString.Split('?');
+
+            var connectionString = stringArray[0].EnsureEndsWith('/') +
+                                   "Db_" +
+                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/MongoDbFixture.cs b/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/MongoDbFixture.cs
index 97799fc03b..385f9d3321 100644
--- a/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/MongoDbFixture.cs
+++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.PermissionManagement.MongoDB
 {
@@ -10,8 +12,12 @@ namespace Volo.Abp.PermissionManagement.MongoDB
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            //TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs b/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs
index ec221eba15..8bc35e2724 100644
--- a/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs
+++ b/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs
@@ -12,9 +12,11 @@ namespace Volo.Abp.SettingManagement.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var stringArray = MongoDbFixture.ConnectionString.Split('?');
+
+            var connectionString = stringArray[0].EnsureEndsWith('/') +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/MongoDbFixture.cs b/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/MongoDbFixture.cs
index 4f9142a829..1212bb90f0 100644
--- a/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/MongoDbFixture.cs
+++ b/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.SettingManagement.MongoDB
 {
@@ -10,8 +12,12 @@ namespace Volo.Abp.SettingManagement.MongoDB
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            //TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs
index 9584ec2d44..29154cc271 100644
--- a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs
+++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs
@@ -12,9 +12,11 @@ namespace Volo.Abp.TenantManagement.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var stringArray = MongoDbFixture.ConnectionString.Split('?');
+
+            var connectionString = stringArray[0].EnsureEndsWith('/') +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/MongoDbFixture.cs b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/MongoDbFixture.cs
index 1b3777f6a8..6c95e09086 100644
--- a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/MongoDbFixture.cs
+++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.TenantManagement.MongoDB
 {
@@ -10,8 +12,12 @@ namespace Volo.Abp.TenantManagement.MongoDB
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            //TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbFixture.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbFixture.cs
index d1a863eb2c..565bd1f5ff 100644
--- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbFixture.cs
+++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace MyCompanyName.MyProjectName.MongoDB
 {
@@ -10,8 +12,11 @@ namespace MyCompanyName.MyProjectName.MongoDB
 
         static MyProjectNameMongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs
index 44783b67e4..386c82d5b9 100644
--- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs
+++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs
@@ -12,9 +12,11 @@ namespace MyCompanyName.MyProjectName.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MyProjectNameMongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var stringArray = MyProjectNameMongoDbFixture.ConnectionString.Split('?');
+
+            var connectionString = stringArray[0].EnsureEndsWith('/') +
                                    "Db_" +
-                                   Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MongoDbFixture.cs
index e471590369..55a7072a9d 100644
--- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MongoDbFixture.cs
+++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MongoDbFixture.cs
@@ -1,5 +1,7 @@
 using System;
 using Mongo2Go;
+using MongoDB.Driver;
+using Volo.Abp.MongoDB;
 
 namespace MyCompanyName.MyProjectName.MongoDB
 {
@@ -10,8 +12,12 @@ namespace MyCompanyName.MyProjectName.MongoDB
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
+            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 10);
             ConnectionString = MongoDbRunner.ConnectionString;
+
+            //TODO It can be removed, when Mongo2Go solves this issue : https://github.com/Mongo2Go/Mongo2Go/issues/89
+            var client = new MongoClient(MongoDbRunner.ConnectionString);
+            client.EnsureReplicationSetReady();
         }
 
         public void Dispose()
diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs
index f29c713c05..d074fe6b43 100644
--- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs
+++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs
@@ -12,9 +12,11 @@ namespace MyCompanyName.MyProjectName.MongoDB
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
+            var stringArray = MongoDbFixture.ConnectionString.Split('?');
+
+            var connectionString = stringArray[0].EnsureEndsWith('/') +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
 
             Configure<AbpDbConnectionOptions>(options =>
             {
@@ -22,4 +24,4 @@ namespace MyCompanyName.MyProjectName.MongoDB
             });
         }
     }
-}
\ No newline at end of file
+}