diff --git a/.github/workflows/tests-outerloop.yml b/.github/workflows/tests-outerloop.yml
index 8aa81ffa506..f79ca7017a1 100644
--- a/.github/workflows/tests-outerloop.yml
+++ b/.github/workflows/tests-outerloop.yml
@@ -93,7 +93,7 @@ jobs:
         if: always()
         shell: pwsh
         run: |
-          $logDirectory = "${{ github.workspace }}/artifacts/log/**/TestLogs"
+          $logDirectory = "${{ github.workspace }}/artifacts/TestResults"
           $trxFiles = Get-ChildItem -Path $logDirectory -Filter *.trx -Recurse
 
           $testResults = @() # Initialize an array to store test results
@@ -172,4 +172,5 @@ jobs:
           path: |
             ${{ github.workspace }}/artifacts/log/*/*.binlog
             ${{ github.workspace }}/artifacts/log/*/TestLogs/**
+            ${{ github.workspace }}/artifacts/TestResults/*/*.trx
           retention-days: 5
diff --git a/eng/Testing.targets b/eng/Testing.targets
index b41cd7ceb59..d9620e11fd2 100644
--- a/eng/Testing.targets
+++ b/eng/Testing.targets
@@ -50,7 +50,8 @@
     <SkipTests>true</SkipTests>
 
     <!-- Only run tests if the build is running on GitHub Actions  -->
-    <SkipTests Condition=" '$(IsGitHubActionsRunner)' == 'true' and '$(RunOnGithubActions)' == 'true' ">false</SkipTests>
+    <SkipTests Condition=" '$(IsGitHubActionsRunner)' == 'true' and '$(BuildOs)' == 'windows' and '$(RunOnGithubActionsWindows)' == 'true' ">false</SkipTests>
+    <SkipTests Condition=" '$(IsGitHubActionsRunner)' == 'true' and '$(BuildOs)' != 'windows' and '$(RunOnGithubActionsLinux)' == 'true' ">false</SkipTests>
 
     <!-- Only run tests if the build is running on Helix infra  -->
     <SkipTests Condition=" '$(IsAzdoHelixRunner)' == 'true' and '$(RunOnAzdoHelix)' == 'true' ">false</SkipTests>
diff --git a/tests/Aspire.Components.Common.Tests/Aspire.Components.Common.Tests.csproj b/tests/Aspire.Components.Common.Tests/Aspire.Components.Common.Tests.csproj
index 3e291ae6127..8bd5357c0c0 100644
--- a/tests/Aspire.Components.Common.Tests/Aspire.Components.Common.Tests.csproj
+++ b/tests/Aspire.Components.Common.Tests/Aspire.Components.Common.Tests.csproj
@@ -2,6 +2,14 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
+
+    <!--
+      Whilst this looks like a test project, it is not... https://github.com/dotnet/aspire/pull/8498/files#r2029349258
+      -->
+    <IsTestUtilityProject>true</IsTestUtilityProject>
+    <SkipTests>true</SkipTests>
+    <DeployOutsideOfRepoSupportFiles>false</DeployOutsideOfRepoSupportFiles>
+
     <!-- https://learn.microsoft.com/dotnet/core/testing/microsoft-testing-platform-exit-codes -->
     <!-- Exit code 8 is "zero tests ran" -->
     <!-- Currently, none of the tests in this project run in CI. All are ignored -->