diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7bb142d6c5..67da76288a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -99,7 +99,13 @@ jobs:
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
       with:
-        files: ./artifacts/coverage/coverage.cobertura.xml
+        flags: ${{ runner.os }}
+        token: ${{ secrets.CODECOV_TOKEN }}
+
+    - name: Upload test results to Codecov
+      uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+      if: ${{ !cancelled() }}
+      with:
         flags: ${{ runner.os }}
         token: ${{ secrets.CODECOV_TOKEN }}
 
diff --git a/.gitignore b/.gitignore
index 1dac93310b..0857e5a38e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 BenchmarkDotNet.Artifacts*/
 coverage
 coverage.*
+junit.xml
 node_modules/
 *.binlog
 *.user
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 713024d841..af8ea37b49 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -8,6 +8,7 @@
   <ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
     <PackageReference Include="coverlet.msbuild" PrivateAssets="All" />
     <PackageReference Include="GitHubActionsTestLogger" PrivateAssets="All" />
+    <PackageReference Include="JunitXml.TestLogger" PrivateAssets="All" />
     <PackageReference Include="ReportGenerator" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(CollectCoverage)' == 'true' ">
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 0eb732cb79..60221bd87a 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,6 +6,7 @@
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageVersion Include="IdentityServer4" Version="3.1.4" />
     <PackageVersion Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
+    <PackageVersion Include="JunitXml.TestLogger" Version="6.1.0" />
     <PackageVersion Include="Microsoft.AspNetCore" Version="2.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.3.0" />
diff --git a/build.ps1 b/build.ps1
index 78a8c2b1df..e9f016451b 100755
--- a/build.ps1
+++ b/build.ps1
@@ -19,8 +19,8 @@ if ($LASTEXITCODE -ne 0) {
 $additionalArgs = @()
 
 if (![string]::IsNullOrEmpty($env:GITHUB_SHA)) {
-    $additionalArgs += "--logger"
-    $additionalArgs += "GitHubActions;report-warnings=false"
+    $additionalArgs += "--logger:GitHubActions;report-warnings=false"
+    $additionalArgs += "--logger:junit;LogFilePath=junit.xml"
 }
 
 dotnet test --configuration $Configuration $additionalArgs