diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 850b756..0cfd9f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,9 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v3.0.3
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: |
+            6.0.x
+            7.0.x
       - name: Build
         run: dotnet build src --configuration Release
       - name: Tests
diff --git a/src/ServiceComposer.AspNetCore.Testing/SelfContainedWebApplicationFactoryWithHost.cs b/src/ServiceComposer.AspNetCore.Testing/SelfContainedWebApplicationFactoryWithHost.cs
index 2f09ee3..2035eb5 100644
--- a/src/ServiceComposer.AspNetCore.Testing/SelfContainedWebApplicationFactoryWithHost.cs
+++ b/src/ServiceComposer.AspNetCore.Testing/SelfContainedWebApplicationFactoryWithHost.cs
@@ -1,6 +1,4 @@
-#if NET5_0 || NETCOREAPP
-
-using System;
+using System;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
@@ -49,5 +47,4 @@ protected override IHostBuilder CreateHostBuilder()
             return hostBuilder;
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/ServiceComposer.AspNetCore.Testing/ServiceComposer.AspNetCore.Testing.csproj b/src/ServiceComposer.AspNetCore.Testing/ServiceComposer.AspNetCore.Testing.csproj
index 8c2780f..a3e37dd 100644
--- a/src/ServiceComposer.AspNetCore.Testing/ServiceComposer.AspNetCore.Testing.csproj
+++ b/src/ServiceComposer.AspNetCore.Testing/ServiceComposer.AspNetCore.Testing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -21,16 +21,23 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="..\..\assets\ServiceComposer.png" Pack="true" PackagePath="\"/>
+        <None Include="..\..\assets\ServiceComposer.png" Pack="true" PackagePath="\" />
     </ItemGroup>
-
+    
     <ItemGroup>
-        <FrameworkReference Include="Microsoft.AspNetCore.App"/>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[6.0.0, 8.0.0)"/>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[6.0.12, 7.0.0)" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[7.0.1, 8.0.0)" />
     </ItemGroup>
     
      <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>