diff --git a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/service/model/DefaultTraceRecorderTest.java b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/service/model/DefaultTraceRecorderTest.java
index 9c0a3450ae..7b3b0d30b7 100644
--- a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/service/model/DefaultTraceRecorderTest.java
+++ b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/service/model/DefaultTraceRecorderTest.java
@@ -110,8 +110,8 @@ public class DefaultTraceRecorderTest extends AbstractGhidraHeadedDebuggerGUITes
 		Language lang = trace.getBaseLanguage();
 		Register r0 = lang.getRegister("r0");
 		Register r1 = lang.getRegister("r1");
-		//TraceThread thread = waitForValue(() -> recorder.getTraceThread(mb.testThread1));
-		TraceThread thread = recorder.getTraceThread(mb.testThread1);
+		TraceThread thread = waitForValue(() -> recorder.getTraceThread(mb.testThread1));
+		//TraceThread thread = recorder.getTraceThread(mb.testThread1);
 		TraceMemoryRegisterSpace rs = createRegSpace(thread);
 		mb.testProcess1.regs.addRegistersFromLanguage(getToyBE64Language(),
 			Register::isBaseRegister);