diff --git a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/service/tracemgr/DebuggerTraceManagerServiceTest.java b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/service/tracemgr/DebuggerTraceManagerServiceTest.java
index 5412c5e688..a2f7a3eebd 100644
--- a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/service/tracemgr/DebuggerTraceManagerServiceTest.java
+++ b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/service/tracemgr/DebuggerTraceManagerServiceTest.java
@@ -25,18 +25,19 @@ import org.junit.experimental.categories.Category;
 
 import db.Transaction;
 import generic.test.category.NightlyCategory;
+import generic.test.rule.Repeated;
 import ghidra.app.plugin.core.debug.gui.AbstractGhidraHeadedDebuggerTest;
 import ghidra.app.plugin.core.debug.service.control.DebuggerControlServicePlugin;
-import ghidra.app.services.*;
+import ghidra.app.services.DebuggerControlService;
 import ghidra.dbg.model.TestTargetStack;
 import ghidra.dbg.model.TestTargetStackFrameHasRegisterBank;
 import ghidra.dbg.target.schema.SchemaContext;
 import ghidra.dbg.target.schema.TargetObjectSchema.SchemaName;
+import ghidra.dbg.target.schema.XmlSchemaContext;
 import ghidra.debug.api.action.ActionSource;
 import ghidra.debug.api.control.ControlMode;
 import ghidra.debug.api.model.TraceRecorder;
 import ghidra.debug.api.tracemgr.DebuggerCoordinates;
-import ghidra.dbg.target.schema.XmlSchemaContext;
 import ghidra.framework.model.DomainFile;
 import ghidra.trace.database.target.DBTraceObjectManager;
 import ghidra.trace.database.target.DBTraceObjectManagerTest;
@@ -240,6 +241,8 @@ public class DebuggerTraceManagerServiceTest extends AbstractGhidraHeadedDebugge
 			objThread0 =
 				objectManager.createObject(TraceObjectKeyPath.parse("Targets[0].Threads[0]"));
 		}
+		// Manager listens for the root-created event to activate it. Wait for it to clear.
+		waitForDomainObject(tb.trace);
 		TraceThread thread =
 			Objects.requireNonNull(objThread0.queryInterface(TraceObjectThread.class));
 
diff --git a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/LldbCommandsTest.java b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/LldbCommandsTest.java
index dc05dbeb86..a62dc79713 100644
--- a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/LldbCommandsTest.java
+++ b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/LldbCommandsTest.java
@@ -1065,6 +1065,7 @@ public class LldbCommandsTest extends AbstractLldbTraceRmiTest {
 					.getValuePaths(Lifespan.at(0),
 						PathPredicates.parse("Processes[].Breakpoints[]"))
 					.map(p -> p.getLastEntry())
+					.sorted(Comparator.comparing(TraceObjectValue::getEntryKey))
 					.toList();
 			assertEquals(2, procBreakLocVals.size());
 			AddressRange rangeMain =
@@ -1103,6 +1104,7 @@ public class LldbCommandsTest extends AbstractLldbTraceRmiTest {
 					.getValuePaths(Lifespan.at(0),
 						PathPredicates.parse("Processes[].Watchpoints[]"))
 					.map(p -> p.getLastEntry())
+					.sorted(Comparator.comparing(TraceObjectValue::getEntryKey))
 					.toList();
 			assertEquals(3, procWatchLocVals.size());
 			AddressRange rangeMain0 =
diff --git a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/LldbMethodsTest.java b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/LldbMethodsTest.java
index 8da5dbc91c..aae6054dd4 100644
--- a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/LldbMethodsTest.java
+++ b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/LldbMethodsTest.java
@@ -111,6 +111,7 @@ public class LldbMethodsTest extends AbstractLldbTraceRmiTest {
 						.getValuePaths(Lifespan.at(0),
 							PathPredicates.parse("Processes[].Breakpoints[]"))
 						.map(p -> p.getLastEntry())
+						.sorted(Comparator.comparing(TraceObjectValue::getEntryKey))
 						.toList();
 				assertEquals(2, procBreakLocVals.size());
 				AddressRange rangeMain =
@@ -150,6 +151,7 @@ public class LldbMethodsTest extends AbstractLldbTraceRmiTest {
 						.getValuePaths(Lifespan.at(0),
 							PathPredicates.parse("Processes[].Breakpoints[]"))
 						.map(p -> p.getLastEntry())
+						.sorted(Comparator.comparing(TraceObjectValue::getEntryKey))
 						.toList();
 				assertEquals(2, procBreakLocVals.size());
 				AddressRange rangeMain =