diff --git a/EnvelopeGenerator.Tests.Application/DocSignedNotificationTests.cs b/EnvelopeGenerator.Tests.Application/DocSignedNotificationTests.cs
index 3d7c17c8..cd035265 100644
--- a/EnvelopeGenerator.Tests.Application/DocSignedNotificationTests.cs
+++ b/EnvelopeGenerator.Tests.Application/DocSignedNotificationTests.cs
@@ -2,11 +2,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
-using EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
-using EnvelopeGenerator.Domain.Entities;
 using Microsoft.Extensions.DependencyInjection;
-using System.Dynamic;
-using System.Threading.Tasks;
 
 namespace EnvelopeGenerator.Tests.Application;
 
@@ -14,9 +10,13 @@ public class DocSignedNotificationTests : TestBase
 {
     protected IMapper _mapper;
 
-    public override Task Setup()
+    protected override void ConfigureServices(IServiceCollection services)
     {
-        return base.Setup();
+    }
+
+    public override async Task Setup()
+    {
+        await base.Setup();
         _mapper = Host.Services.GetRequiredService<IMapper>();
     }
 
diff --git a/EnvelopeGenerator.Tests.Application/Fake.cs b/EnvelopeGenerator.Tests.Application/Fake.cs
index 362916c6..f4dc20ae 100644
--- a/EnvelopeGenerator.Tests.Application/Fake.cs
+++ b/EnvelopeGenerator.Tests.Application/Fake.cs
@@ -24,7 +24,7 @@ public class Fake
 {
     public static readonly Faker Provider = new("de");
 
-    public static Host CreateHost() => Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder()
+    public static Host CreateHost(Action<IServiceCollection>? configureServices = null) => Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder()
         .ConfigureAppConfiguration((context, config) =>
         {
             // add appsettings.json
@@ -33,6 +33,9 @@ public class Fake
         })
         .ConfigureServices((context, services) =>
         {
+            // add custom services
+            configureServices?.Invoke(services);
+
             IConfiguration configuration = context.Configuration;
 
             // add Application and Infrastructure services
diff --git a/EnvelopeGenerator.Tests.Application/HistoryTests.cs b/EnvelopeGenerator.Tests.Application/HistoryTests.cs
index 2c0912c9..ca40a074 100644
--- a/EnvelopeGenerator.Tests.Application/HistoryTests.cs
+++ b/EnvelopeGenerator.Tests.Application/HistoryTests.cs
@@ -4,12 +4,17 @@ using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Application.Histories.Queries;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace EnvelopeGenerator.Tests.Application;
 
 [TestFixture]
 public class HistoryTests : TestBase
 {
+    protected override void ConfigureServices(IServiceCollection services)
+    {
+    }
+
     [SetUp]
     public override Task Setup()
     {
diff --git a/EnvelopeGenerator.Tests.Application/TestBase.cs b/EnvelopeGenerator.Tests.Application/TestBase.cs
index b671b4eb..e899cae2 100644
--- a/EnvelopeGenerator.Tests.Application/TestBase.cs
+++ b/EnvelopeGenerator.Tests.Application/TestBase.cs
@@ -8,7 +8,7 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace EnvelopeGenerator.Tests.Application;
 
-public class TestBase : Faker
+public abstract class TestBase : Faker
 {
     protected Fake.Host Host;
 
@@ -24,10 +24,12 @@ public class TestBase : Faker
 
     protected IRepository Repository => Host.Services.GetRequiredService<IRepository>();
 
+    protected abstract void ConfigureServices(IServiceCollection services);
+
     [SetUp]
     public virtual async Task Setup()
     {
-        Host = Fake.CreateHost();
+        Host = Fake.CreateHost(ConfigureServices);
         await Host.AddSamples();
     }