diff --git a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/app/services/TraceRmiService.java b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/app/services/TraceRmiService.java
index 5ddf5750b1..eabd643d58 100644
--- a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/app/services/TraceRmiService.java
+++ b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/app/services/TraceRmiService.java
@@ -34,7 +34,7 @@ import ghidra.framework.plugintool.ServiceInfo;
  */
 @ServiceInfo(
 	description = "A service for accepting and creating Trace RMI connections",
-	defaultProviderName = "ghidra.app.plugin.core.debug.service.rmi.trace.TraceRmiPlugin")
+	defaultProviderName = "ghidra.app.plugin.core.debug.service.tracermi.TraceRmiPlugin")
 public interface TraceRmiService {
 	/**
 	 * Get the address (and port) of the Trace RMI TCP server
diff --git a/Ghidra/Debug/Debugger-rmi-trace/build.gradle b/Ghidra/Debug/Debugger-rmi-trace/build.gradle
index 201c190075..5b05a1628b 100644
--- a/Ghidra/Debug/Debugger-rmi-trace/build.gradle
+++ b/Ghidra/Debug/Debugger-rmi-trace/build.gradle
@@ -32,6 +32,7 @@ dependencies {
 	testImplementation project(path: ':Debugger', configuration: 'testArtifacts')
 	testImplementation project(path: ':Framework-AsyncComm', configuration: 'testArtifacts')
 	testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-TraceModeling', configuration: 'testArtifacts')
 }
 
 task generateProtoPy {