diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index dfb06547eeb8af..2a204eb14a207d 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -244,7 +244,7 @@ extends:
             extraStepsTemplate: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
             extraStepsParameters:
               creator: dotnet-bot
-              testBuildArgs: nativeaot tree nativeaot /p:BuildNativeAotFrameworkObjects=true
+              testBuildArgs: 'nativeaot tree ";nativeaot;Loader;Interop;" /p:BuildNativeAotFrameworkObjects=true'
               liveLibrariesBuildConfig: Release
             testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
             extraVariablesTemplates:
diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets
index cbeda81910e992..104f53ebda3a8a 100644
--- a/src/tests/Directory.Build.targets
+++ b/src/tests/Directory.Build.targets
@@ -549,6 +549,16 @@
 
     <!-- Bump the generic cycle tolerance. There's at least one test with a cycle that is reachable at runtime to depth 6 -->
     <IlcArg Include="--maxgenericcycle:7" />
+
+    <!-- We set TrimMode to partial so that we don't trim parts of the tests,
+         but don't make this apply to xunit cruft -->
+    <IlcArg Include="--trim:Microsoft.DotNet.XUnitExtensions" />
+    <IlcArg Include="--trim:xunit.abstractions" />
+    <IlcArg Include="--trim:xunit.assert" />
+    <IlcArg Include="--trim:xunit.console" />
+    <IlcArg Include="--trim:xunit.core" />
+    <IlcArg Include="--trim:xunit.execution.dotnet" />
+    <IlcArg Include="--trim:xunit.abstractions" />
   </ItemGroup>
 
   <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets" Condition="'$(TestBuildMode)' == 'nativeaot'" />