diff --git a/src/mono/mono/eventpipe/ep-rt-mono-runtime-provider.c b/src/mono/mono/eventpipe/ep-rt-mono-runtime-provider.c
index 151dafced3e8e8..0324cb17381e7f 100644
--- a/src/mono/mono/eventpipe/ep-rt-mono-runtime-provider.c
+++ b/src/mono/mono/eventpipe/ep-rt-mono-runtime-provider.c
@@ -4165,6 +4165,9 @@ calculate_live_keywords (
 	ep_requires_lock_held ();
 }
 
+// TODO: If/when we can unload vtables, we would need to temporary
+// root the vtable pointers currently stored in buffered gc events.
+// Once all events are fired, we can remove root from GC.
 static
 void
 gc_event_callback (
@@ -4199,7 +4202,6 @@ gc_event_callback (
 		if (is_gc_heap_dump_enabled (context)) {
 			EP_ASSERT (context->state == GC_HEAP_DUMP_CONTEXT_STATE_DUMP);
 			gc_heap_dump_context_build_roots (context);
-			fire_buffered_gc_events (context);
 		}
 		break;
 	}
@@ -4289,6 +4291,7 @@ gc_heap_dump_trigger_callback (MonoProfiler *prof)
 				mono_profiler_set_gc_event_callback (_ep_rt_mono_default_profiler_provider, gc_event_callback);
 				mono_gc_collect (mono_gc_max_generation ());
 				mono_profiler_set_gc_event_callback (_ep_rt_mono_default_profiler_provider, NULL);
+				fire_buffered_gc_events (heap_dump_context);
 			}
 
 			heap_dump_context->state = GC_HEAP_DUMP_CONTEXT_STATE_END;
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 53e2109bec9192..d1b48dbc3c4841 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -1895,9 +1895,6 @@
         <ExcludeList Include="$(XunitTestBinBase)/Regressions/coreclr/22021/consumer/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/gcdump/gcdump/**">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)/Interop/DllImportAttribute/DllImportPath/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
@@ -3523,6 +3520,9 @@
         <ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/simpleruntimeeventvalidation/**">
             <Issue>System.Diagnostics.Process is not supported on wasm</Issue>
         </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/gcdump/**">
+            <Issue>System.Diagnostics.Process is not supported on wasm</Issue>
+        </ExcludeList>
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetOS)' == 'android'" >
diff --git a/src/tests/tracing/eventpipe/gcdump/gcdump.cs b/src/tests/tracing/eventpipe/gcdump/gcdump.cs
index 346cfca11242ef..7819d9e93ecf21 100644
--- a/src/tests/tracing/eventpipe/gcdump/gcdump.cs
+++ b/src/tests/tracing/eventpipe/gcdump/gcdump.cs
@@ -20,6 +20,8 @@ namespace Tracing.Tests.EventSourceError
     // Regression test for https://github.com/dotnet/runtime/issues/38639 
     public class GCDumpTest
     {
+        private static bool _seenGCStart = false;
+        private static bool _seenGCStop = false;
         private static int _bulkTypeCount = 0;
         private static int _bulkNodeCount = 0;
         private static int _bulkEdgeCount = 0;
@@ -27,6 +29,7 @@ public class GCDumpTest
         private static int _bulkRootStaticVarCount = 0;
 
         private static readonly ulong GC_HeapDump_Keyword = 0x100000UL;
+        private static ManualResetEvent _gcStopReceived = new ManualResetEvent(false);
 
         public static int Main()
         {
@@ -48,11 +51,17 @@ public static int Main()
 
         private static Action _eventGeneratingAction = () =>
         {
-            // This space intentionally left blank
+            // Wait up to 10 seconds to receive GCStop event.
+            _gcStopReceived.WaitOne(10000);
         };
 
         private static Func<EventPipeEventSource, Func<int>> _DoesRundownContainMethodEvents = (source) =>
         {
+            source.Clr.GCStart += (GCStartTraceData data) =>
+            {
+                _seenGCStart = true;
+            };
+
             source.Clr.TypeBulkType += (GCBulkTypeTraceData data) =>
             {
                 _bulkTypeCount += data.Count;
@@ -78,13 +87,21 @@ public static int Main()
                 _bulkRootStaticVarCount += data.Count;
             };
 
+            source.Clr.GCStop += (GCEndTraceData data) =>
+            {
+                _seenGCStop = true;
+                _gcStopReceived.Set();
+            };
+
             return () => 
             {
                 // Hopefully it is low enough to be resilient to changes in the runtime
                 // and high enough to catch issues. There should be between hundreds and thousands
                 // for each, but the number is variable and the point of the test is to verify
                 // that we get any events at all.
-                if (_bulkTypeCount > 50
+                if (_seenGCStart
+                     && _seenGCStop
+                     && _bulkTypeCount > 50
                      && _bulkNodeCount > 50
                      && _bulkEdgeCount > 50
                      && _bulkRootEdgeCount > 50
@@ -95,6 +112,8 @@ public static int Main()
 
 
                 Console.WriteLine($"Test failed due to missing GC heap events.");
+                Console.WriteLine($"_seenGCStart =            {_seenGCStart}");
+                Console.WriteLine($"_seenGCStop =             {_seenGCStop}");
                 Console.WriteLine($"_bulkTypeCount =          {_bulkTypeCount}");
                 Console.WriteLine($"_bulkNodeCount =          {_bulkNodeCount}");
                 Console.WriteLine($"_bulkEdgeCount =          {_bulkEdgeCount}");