diff --git a/build.cake b/build.cake
index b45c041be..a0585f373 100644
--- a/build.cake
+++ b/build.cake
@@ -83,7 +83,7 @@ Task("Test")
 
         foreach(var project in testProjects) 
         {                      
-            DotNetTest(project.ToString(), new DotNetTestSettings
+            DotNetTest(project.ToString(), "--collect:\"XPlat Code Coverage\" --results-directory ./coverage", new DotNetTestSettings
             {
                 Framework = "net48",
                 NoBuild = true,
@@ -91,7 +91,7 @@ Task("Test")
                 Configuration = parameters.Configuration
             });          
 
-            DotNetTest(project.ToString(), new DotNetTestSettings
+            DotNetTest(project.ToString(), "--collect:\"XPlat Code Coverage\" --results-directory ./coverage", new DotNetTestSettings
             {
                 Framework = "net6.0",
                 NoBuild = true,
diff --git a/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj b/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj
index c73ad8719..bc66540ef 100644
--- a/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj
+++ b/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj
@@ -10,6 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.2" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Machine.Specifications" Version="1.1.1" />
diff --git a/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj b/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj
index aa9aa3170..6227480ce 100644
--- a/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj
+++ b/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj
@@ -18,14 +18,12 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.2" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="FakeItEasy" Version="8.2.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="NUnit.Analyzers" Version="4.2.0" PrivateAssets="all" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
   </ItemGroup>
@@ -43,4 +41,4 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>