diff --git a/src/tests/tracing/eventlistener/EventListenerThreadPool.cs b/src/tests/tracing/eventlistener/EventListenerThreadPool.cs
index 25aae70e3f59ac..653195640b5c65 100644
--- a/src/tests/tracing/eventlistener/EventListenerThreadPool.cs
+++ b/src/tests/tracing/eventlistener/EventListenerThreadPool.cs
@@ -103,15 +103,12 @@ public static int TestEntryPoint()
 
                 WaitHandle.WaitAll(waitEvents, TimeSpan.FromMinutes(1));
 
-                if (!TestLibrary.Utilities.IsNativeAot)
+                listener.TPWaitWorkerThreadEvent.WaitOne(TimeSpan.FromMinutes(1));
+                if (listener.TPWorkerThreadWaitCount == 0)
                 {
-                    listener.TPWaitWorkerThreadEvent.WaitOne(TimeSpan.FromMinutes(1));
-                    if (listener.TPWorkerThreadWaitCount == 0)
-                    {
-                        Console.WriteLine("Test Failed: Did not see the expected event.");
-                        Console.WriteLine($"ThreadPoolWorkerThreadWaitCount: {listener.TPWorkerThreadWaitCount}");
-                        return -1;
-                    }
+                    Console.WriteLine("Test Failed: Did not see the expected event.");
+                    Console.WriteLine($"ThreadPoolWorkerThreadWaitCount: {listener.TPWorkerThreadWaitCount}");
+                    return -1;
                 }
 
                 if (!(listener.TPIOPack >= listener.TPIOPackGoal &&
diff --git a/src/tests/tracing/eventlistener/EventListenerThreadPool.csproj b/src/tests/tracing/eventlistener/EventListenerThreadPool.csproj
index 95796f94b76951..6bc83b848bebb1 100644
--- a/src/tests/tracing/eventlistener/EventListenerThreadPool.csproj
+++ b/src/tests/tracing/eventlistener/EventListenerThreadPool.csproj
@@ -7,6 +7,8 @@
     <!-- Tracing tests routinely time out with jitstress and gcstress -->
     <GCStressIncompatible>true</GCStressIncompatible>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
+    <!--  We expect to see events from the portable threadpool, AOT defaults to Windows threadpool -->
+    <UseWindowsThreadPool Condition="'$(TestBuildMode)' == 'nativeaot'">false</UseWindowsThreadPool>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="EventListenerThreadPool.cs" />
diff --git a/src/tests/tracing/eventpipe/eventsvalidation/ExceptionThrown_V1.cs b/src/tests/tracing/eventpipe/eventsvalidation/ExceptionThrown_V1.cs
index 35bd99ead3e3b2..367edfa7f7a734 100644
--- a/src/tests/tracing/eventpipe/eventsvalidation/ExceptionThrown_V1.cs
+++ b/src/tests/tracing/eventpipe/eventsvalidation/ExceptionThrown_V1.cs
@@ -22,22 +22,16 @@ public static int TestEntryPoint()
                 new EventPipeProvider("Microsoft-Windows-DotNETRuntime", EventLevel.Warning, 0b1000_0000_0000_0000)
             };
 
-            bool enableRundown = TestLibrary.Utilities.IsNativeAot? false: true;
-            Dictionary<string, ExpectedEventCount> _expectedEventCounts = TestLibrary.Utilities.IsNativeAot? _expectedEventCountsNativeAOT: _expectedEventCountsCoreCLR;
-
-            return IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024, enableRundownProvider:enableRundown);
+            return IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024);
         }
 
-        private static Dictionary<string, ExpectedEventCount> _expectedEventCountsCoreCLR = new Dictionary<string, ExpectedEventCount>()
+        private static Dictionary<string, ExpectedEventCount> _expectedEventCounts = new Dictionary<string, ExpectedEventCount>()
         {
             { "Microsoft-Windows-DotNETRuntime", new ExpectedEventCount(1000, 0.2f) },
             { "Microsoft-Windows-DotNETRuntimeRundown", -1 },
             { "Microsoft-DotNETCore-SampleProfiler", -1 }
         };
-        private static Dictionary<string, ExpectedEventCount> _expectedEventCountsNativeAOT = new Dictionary<string, ExpectedEventCount>()
-        {
-            { "Microsoft-Windows-DotNETRuntime", new ExpectedEventCount(1000, 0.2f) }
-        };
+
         private static Action _eventGeneratingAction = () =>
         {
             for (int i = 0; i < 1000; i++)
diff --git a/src/tests/tracing/eventpipe/eventsvalidation/GCEvents.cs b/src/tests/tracing/eventpipe/eventsvalidation/GCEvents.cs
index 28c10fcec66fd2..a3c3962837906c 100644
--- a/src/tests/tracing/eventpipe/eventsvalidation/GCEvents.cs
+++ b/src/tests/tracing/eventpipe/eventsvalidation/GCEvents.cs
@@ -23,25 +23,16 @@ public static int TestEntryPoint()
                 new EventPipeProvider("Microsoft-Windows-DotNETRuntime", EventLevel.Informational, 0b1)
             };
 
-            bool enableRundown = TestLibrary.Utilities.IsNativeAot? false: true;
-            Dictionary<string, ExpectedEventCount> _expectedEventCounts = TestLibrary.Utilities.IsNativeAot? _expectedEventCountsNativeAOT: _expectedEventCountsCoreCLR;
-            
-            return IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024, _DoesTraceContainEvents, enableRundownProvider:enableRundown);
+            return IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024, _DoesTraceContainEvents);
         }
 
-        private static Dictionary<string, ExpectedEventCount> _expectedEventCountsCoreCLR = new Dictionary<string, ExpectedEventCount>()
+        private static Dictionary<string, ExpectedEventCount> _expectedEventCounts = new Dictionary<string, ExpectedEventCount>()
         {
             { "Microsoft-Windows-DotNETRuntime", -1 },
             { "Microsoft-Windows-DotNETRuntimeRundown", -1 },
             { "Microsoft-DotNETCore-SampleProfiler", -1 }
         };
 
-        private static Dictionary<string, ExpectedEventCount> _expectedEventCountsNativeAOT = new Dictionary<string, ExpectedEventCount>()
-        {
-            { "Microsoft-Windows-DotNETRuntime", -1 }
-        };
-
-
         private static Action _eventGeneratingAction = () =>
         {
             for (int i = 0; i < 50; i++)
diff --git a/src/tests/tracing/eventpipe/eventsvalidation/GCFinalizers.cs b/src/tests/tracing/eventpipe/eventsvalidation/GCFinalizers.cs
index 0d32839c5122f8..666768c884473a 100644
--- a/src/tests/tracing/eventpipe/eventsvalidation/GCFinalizers.cs
+++ b/src/tests/tracing/eventpipe/eventsvalidation/GCFinalizers.cs
@@ -23,24 +23,16 @@ public static int TestEntryPoint()
                 new EventPipeProvider("Microsoft-Windows-DotNETRuntime", EventLevel.Informational, 0b1)
             };
 
-            bool enableRundown = TestLibrary.Utilities.IsNativeAot? false: true;
-            Dictionary<string, ExpectedEventCount> _expectedEventCounts = TestLibrary.Utilities.IsNativeAot? _expectedEventCountsNativeAOT: _expectedEventCountsCoreCLR;
-
-            return IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024, _DoesTraceContainEvents, enableRundownProvider:enableRundown);
+            return IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024, _DoesTraceContainEvents);
         }
 
-        private static Dictionary<string, ExpectedEventCount> _expectedEventCountsCoreCLR = new Dictionary<string, ExpectedEventCount>()
+        private static Dictionary<string, ExpectedEventCount> _expectedEventCounts = new Dictionary<string, ExpectedEventCount>()
         {
             { "Microsoft-Windows-DotNETRuntime", -1 },
             { "Microsoft-Windows-DotNETRuntimeRundown", -1 },
             { "Microsoft-DotNETCore-SampleProfiler", -1 }
         };
 
-        private static Dictionary<string, ExpectedEventCount> _expectedEventCountsNativeAOT = new Dictionary<string, ExpectedEventCount>()
-        {
-            { "Microsoft-Windows-DotNETRuntime", -1 }
-        };
-
         private static Action _eventGeneratingAction = () =>
         {
             for (int i = 0; i < 50; i++)
diff --git a/src/tests/tracing/eventpipe/gcdump/gcdump.cs b/src/tests/tracing/eventpipe/gcdump/gcdump.cs
index da78529b7dc18f..e2a54414680f63 100644
--- a/src/tests/tracing/eventpipe/gcdump/gcdump.cs
+++ b/src/tests/tracing/eventpipe/gcdump/gcdump.cs
@@ -44,8 +44,7 @@ public static int TestEntryPoint()
                 new EventPipeProvider("Microsoft-Windows-DotNETRuntime", eventLevel: EventLevel.Verbose, keywords: (long)ClrTraceEventParser.Keywords.GCHeapSnapshot)
             };
 
-            bool enableRundown = TestLibrary.Utilities.IsNativeAot? false: true;
-            return IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024, _DoesRundownContainMethodEvents, enableRundownProvider: enableRundown);
+            return IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024, _DoesRundownContainMethodEvents);
         }
 
         private static Dictionary<string, ExpectedEventCount> _expectedEventCounts = new Dictionary<string, ExpectedEventCount>()
diff --git a/src/tests/tracing/eventpipe/providervalidation/providervalidation.cs b/src/tests/tracing/eventpipe/providervalidation/providervalidation.cs
index 953349409275c1..ca1ae7bd7fabce 100644
--- a/src/tests/tracing/eventpipe/providervalidation/providervalidation.cs
+++ b/src/tests/tracing/eventpipe/providervalidation/providervalidation.cs
@@ -37,29 +37,20 @@ public static int TestEntryPoint()
                 new EventPipeProvider("Microsoft-DotNETCore-SampleProfiler", EventLevel.Verbose)
             };
 
-            bool enableRundown = TestLibrary.Utilities.IsNativeAot? false: true;
-
-            Dictionary<string, ExpectedEventCount> _expectedEventCounts = TestLibrary.Utilities.IsNativeAot? _expectedEventCountsNativeAOT: _expectedEventCountsCoreCLR;
-            var ret = IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024, enableRundownProvider: enableRundown);
+            var ret = IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024);
             if (ret < 0)
                 return ret;
             else
                 return 100;
         }
 
-        private static Dictionary<string, ExpectedEventCount> _expectedEventCountsCoreCLR = new Dictionary<string, ExpectedEventCount>()
+        private static Dictionary<string, ExpectedEventCount> _expectedEventCounts = new Dictionary<string, ExpectedEventCount>()
         {
             { "MyEventSource", new ExpectedEventCount(100_000, 0.30f) },
             { "Microsoft-Windows-DotNETRuntimeRundown", -1 },
             { "Microsoft-DotNETCore-SampleProfiler", -1 }
         };
 
-        private static Dictionary<string, ExpectedEventCount> _expectedEventCountsNativeAOT = new Dictionary<string, ExpectedEventCount>()
-        {
-            { "MyEventSource", 100_000 },
-            { "Microsoft-DotNETCore-EventPipe", 1 }
-        };
-
         private static Action _eventGeneratingAction = () => 
         {
             for (int i = 0; i < 100_000; i++)