diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index d06efb331e..1ca503294a 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -4,6 +4,9 @@ run-name: Run tests / ${{ github.event.head_commit.message }}
 on:
   pull_request:
   push:
+  
+env:
+  VSTEST_TESTHOST_SHUTDOWN_TIMEOUT: "500"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}
@@ -88,7 +91,7 @@ jobs:
         if: always()
         with:
           name: test-linux-trx-${{ github.run_id }}
-          path: "**/*.trx"
+          path: "**/*.diag.log"
 
   test-macos:
     runs-on: macos-15
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
new file mode 100644
index 0000000000..906028b024
--- /dev/null
+++ b/tests/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <VSTestDiag>$(MSBuildProjectName).diag.log</VSTestDiag>
+  </PropertyGroup>
+</Project>