diff --git a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngCommandsTest.java b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngCommandsTest.java
index 630ea6d47b..5fec3bdfa1 100644
--- a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngCommandsTest.java
+++ b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngCommandsTest.java
@@ -989,11 +989,9 @@ public class DbgEngCommandsTest extends AbstractDbgEngTraceRmiTest {
 			Address bp1 = rangeMain.getMinAddress();
 
 			assertBreakLoc(procBreakLocVals.get(0), "[0]", bp1, 1,
-				Set.of(TraceBreakpointKind.SW_EXECUTE),
-				"ntdll!LdrInit");
+				Set.of(TraceBreakpointKind.SW_EXECUTE), "ntdll!Ldr");
 			assertBreakLoc(procBreakLocVals.get(1), "[1]", bp1.add(4), 1,
-				Set.of(TraceBreakpointKind.HW_EXECUTE),
-				"ntdll!LdrInit");
+				Set.of(TraceBreakpointKind.HW_EXECUTE), "ntdll!Ldr");
 		}
 	}
 
diff --git a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngMethodsTest.java b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngMethodsTest.java
index 042785351f..dd7d636e98 100644
--- a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngMethodsTest.java
+++ b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngMethodsTest.java
@@ -15,8 +15,7 @@
  */
 package agent.dbgeng.rmi;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 import java.io.File;
@@ -143,11 +142,9 @@ public class DbgEngMethodsTest extends AbstractDbgEngTraceRmiTest {
 				Address main = rangeMain.getMinAddress();
 
 				assertBreakLoc(procBreakLocVals.get(0), "[0]", main, 1,
-					Set.of(TraceBreakpointKind.SW_EXECUTE),
-					"ntdll!LdrInit");
+					Set.of(TraceBreakpointKind.SW_EXECUTE), "ntdll!Ldr");
 				assertBreakLoc(procBreakLocVals.get(1), "[1]", main.add(4), 1,
-					Set.of(TraceBreakpointKind.HW_EXECUTE),
-					"ntdll!LdrInit");
+					Set.of(TraceBreakpointKind.HW_EXECUTE), "ntdll!Ldr");
 			}
 		}
 	}
diff --git a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/AbstractGdbTraceRmiTest.java b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/AbstractGdbTraceRmiTest.java
index a75a647fdc..d10f0507a7 100644
--- a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/AbstractGdbTraceRmiTest.java
+++ b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/AbstractGdbTraceRmiTest.java
@@ -610,7 +610,7 @@ public abstract class AbstractGdbTraceRmiTest extends AbstractGhidraHeadedDebugg
 		// The targets above use different sleep methods:
 		//   Linux spawns clock_nanosleep
 		//   Windows spawns ZwDelayExecution and multiple ZwWaitForWork threads
-		return IS_WINDOWS ? 3 : 1;
+		return IS_WINDOWS ? 2 : 1;
 	}
 
 }
diff --git a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/AbstractLldbTraceRmiTest.java b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/AbstractLldbTraceRmiTest.java
index 2d01bb888b..b97d79024d 100644
--- a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/AbstractLldbTraceRmiTest.java
+++ b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/AbstractLldbTraceRmiTest.java
@@ -93,7 +93,7 @@ public abstract class AbstractLldbTraceRmiTest extends AbstractGhidraHeadedDebug
 		// The targets above use different sleep methods:
 		//   Linux spawns clock_nanosleep
 		//   Windows spawns ZwDelayExecution and multiple ZwWaitForWork threads
-		return IS_WINDOWS ? 3 : 1;
+		return IS_WINDOWS ? 2 : 1;
 	}
 
 	static String getSpecimenPrint() {