diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/arch.py b/Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/arch.py
index 581493d654..5c9f02aaf1 100644
--- a/Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/arch.py
+++ b/Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/arch.py
@@ -118,6 +118,7 @@ data64_compiler_map = {
 x86_compiler_map = {
     'windows': 'windows',
     'Cygwin': 'windows',
+    'linux' : 'gcc',
     'default': 'gcc',
     'unknown': 'gcc',
 }
diff --git a/Ghidra/Framework/Pty/src/test/java/ghidra/pty/testutil/DummyProc.java b/Ghidra/Framework/Pty/src/test/java/ghidra/pty/testutil/DummyProc.java
index 0152751bda..4d374d27b0 100644
--- a/Ghidra/Framework/Pty/src/test/java/ghidra/pty/testutil/DummyProc.java
+++ b/Ghidra/Framework/Pty/src/test/java/ghidra/pty/testutil/DummyProc.java
@@ -40,14 +40,13 @@ public class DummyProc implements AutoCloseable {
 			// just try next strategy
 		}
 
-		List<ResourceFile> mods = Stream.concat(Application.getApplicationRootDirectories()
-				.stream()
-				.map(ar -> new ResourceFile(ar, "Test/DebuggerIntegrationTest")),
-			Application.getModuleRootDirectories().stream())
-				.toList();
-
 		// Try the build/exe/<cmd>/ and build/exe/<cmd>/<platform>/ directory
 		try {
+			List<ResourceFile> mods = Stream.concat(Application.getApplicationRootDirectories()
+					.stream()
+					.map(ar -> new ResourceFile(ar, "Test/DebuggerIntegrationTest")),
+				Application.getModuleRootDirectories().stream())
+					.toList();
 			for (ResourceFile modRoot : mods) {
 				ResourceFile osExe = new ResourceFile(modRoot,
 					"build/os/" + Platform.CURRENT_PLATFORM.getDirectoryName() + "/" + cmd);
diff --git a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/GdbCommandsTest.java b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/GdbCommandsTest.java
index ad845f9731..cc4ad2fa7a 100644
--- a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/GdbCommandsTest.java
+++ b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/GdbCommandsTest.java
@@ -252,7 +252,7 @@ public class GdbCommandsTest extends AbstractGdbTraceRmiTest {
 				Selected Ghidra compiler: gcc""",
 			extractOutSection(out, "---File---"));
 		assertEquals("""
-				Toy:BE:64:default not found in compiler map
+				Toy:BE:64:default not found in compiler map - using default compiler
 				Selected Ghidra language: Toy:BE:64:default
 				Selected Ghidra compiler: default""",
 			extractOutSection(out, "---Language---"));