diff --git a/src/Hosuto.Testing.AspNetCore/Modules/Testing/WebModuleFactory.cs b/src/Hosuto.Testing.AspNetCore/Modules/Testing/WebModuleFactory.cs
index 8036eaa..e399894 100644
--- a/src/Hosuto.Testing.AspNetCore/Modules/Testing/WebModuleFactory.cs
+++ b/src/Hosuto.Testing.AspNetCore/Modules/Testing/WebModuleFactory.cs
@@ -28,8 +28,8 @@ public class WebModuleFactory<TModule> : IDisposable where TModule : class, IWeb
         private TestServer _server;
         private IHost _host;
         private Action<IWebHostBuilder> _configuration;
-        private IList<HttpClient> _clients = new List<HttpClient>();
-        private List<WebModuleFactory<TModule>> _derivedFactories =
+        private readonly IList<HttpClient> _clients = new List<HttpClient>();
+        private readonly List<WebModuleFactory<TModule>> _derivedFactories =
             new List<WebModuleFactory<TModule>>();
 
         /// <summary>
@@ -136,6 +136,28 @@ internal virtual WebModuleFactory<TModule> WithWebHostBuilderCore(Action<IWebHos
             return factory;
         }
 
+        public WebModuleFactory<TModule> WithModuleHostBuilder(Action<IModulesHostBuilder> configure)
+        {
+            var factory = new DelegatedWebApplicationFactory(
+                ClientOptions,
+                CreateServer,
+                CreateHost,
+                () =>
+                {
+                    var builder = CreateModuleHostBuilder();
+                    configure(builder);
+                    return builder;
+                },
+                GetTestAssemblies,
+                ConfigureClient,
+                ConfigureWebHost,
+                ConfigureModule);
+
+            _derivedFactories.Add(factory);
+
+            return factory;
+        }
+
         public WebModuleFactory<TModule> WithModuleConfiguration(Action<IModuleHostingOptions> options)
         {
             var factory = new DelegatedWebApplicationFactory(
diff --git a/test/Hosuto.Hosting.AspNetCore.Tests/Hosuto.Hosting.AspNetCore.Tests.csproj b/test/Hosuto.Hosting.AspNetCore.Tests/Hosuto.Hosting.AspNetCore.Tests.csproj
index 057356f..b66be8a 100644
--- a/test/Hosuto.Hosting.AspNetCore.Tests/Hosuto.Hosting.AspNetCore.Tests.csproj
+++ b/test/Hosuto.Hosting.AspNetCore.Tests/Hosuto.Hosting.AspNetCore.Tests.csproj
@@ -1,36 +1,36 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
 
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.0.3">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/test/Hosuto.Hosting.Tests/Hosuto.Hosting.Tests.csproj b/test/Hosuto.Hosting.Tests/Hosuto.Hosting.Tests.csproj
index eab8d58..694b97f 100644
--- a/test/Hosuto.Hosting.Tests/Hosuto.Hosting.Tests.csproj
+++ b/test/Hosuto.Hosting.Tests/Hosuto.Hosting.Tests.csproj
@@ -1,28 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-
-  </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.0.3">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/test/Hosuto.SimpleInjector.Tests/Hosuto.SimpleInjector.Tests.csproj b/test/Hosuto.SimpleInjector.Tests/Hosuto.SimpleInjector.Tests.csproj
index e399ecd..8f75cad 100644
--- a/test/Hosuto.SimpleInjector.Tests/Hosuto.SimpleInjector.Tests.csproj
+++ b/test/Hosuto.SimpleInjector.Tests/Hosuto.SimpleInjector.Tests.csproj
@@ -1,32 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.0.3">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>