diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 6d58ea3..00dfe65 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -8,8 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Using Include="Xunit" />
     <Using Include="AwesomeAssertions" />
+    <Using Include="Moq" />
+    <Using Include="Xunit" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props
index e2fbd30..8146a0f 100644
--- a/tests/Directory.Packages.props
+++ b/tests/Directory.Packages.props
@@ -5,6 +5,8 @@
   <ItemGroup>
     <PackageVersion Include="AwesomeAssertions" Version="9.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.3.2" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/FiscalOS.API.Tests/FiscalOS.API.Tests.csproj b/tests/FiscalOS.API.Tests/FiscalOS.API.Tests.csproj
index 949d3d8..c8ad21e 100644
--- a/tests/FiscalOS.API.Tests/FiscalOS.API.Tests.csproj
+++ b/tests/FiscalOS.API.Tests/FiscalOS.API.Tests.csproj
@@ -8,9 +8,12 @@
   <ItemGroup>
     <PackageReference Include="AwesomeAssertions" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
+    <PackageReference Include="Moq" />
     <PackageReference Include="xunit.v3.mtp-v2" />
   </ItemGroup>
 
+
   <ItemGroup>
     <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
diff --git a/tests/FiscalOS.Infra.Tests/FiscalOS.Infra.Tests.csproj b/tests/FiscalOS.Infra.Tests/FiscalOS.Infra.Tests.csproj
index 1f791bc..0f8d837 100644
--- a/tests/FiscalOS.Infra.Tests/FiscalOS.Infra.Tests.csproj
+++ b/tests/FiscalOS.Infra.Tests/FiscalOS.Infra.Tests.csproj
@@ -11,6 +11,8 @@
 
   <ItemGroup>
     <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
+    <PackageReference Include="Moq" />
     <PackageReference Include="xunit.v3.mtp-v2" />
   </ItemGroup>
 
@@ -18,4 +20,9 @@
     <ProjectReference Include="..\..\src\FiscalOS.Infra\FiscalOS.Infra.csproj" />
   </ItemGroup>
 
+  <Target Name="GenerateHtmlCoverageReport" AfterTargets="Test">
+    <Exec
+      Command="reportgenerator -reports:./TestResults/Coverage/*.xml -targetdir:./TestResults/Coverage/Report/ -reporttypes:Html_Dark" />
+  </Target>
+
 </Project>