diff --git a/dd-java-agent/agent-debugger/build.gradle b/dd-java-agent/agent-debugger/build.gradle
index 9eac038bfd8..b6836682a5d 100644
--- a/dd-java-agent/agent-debugger/build.gradle
+++ b/dd-java-agent/agent-debugger/build.gradle
@@ -3,6 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 plugins {
   id 'com.gradleup.shadow'
   id 'dd-trace-java.version-file'
+  id 'java-test-fixtures'
 }
 
 apply from: "$rootDir/gradle/java.gradle"
@@ -47,6 +48,14 @@ dependencies {
   implementation libs.okhttp
   implementation libs.slf4j
 
+  // Dependencies needed to compile the test-fixture helpers (LogProbeTestHelper,
+  // MoshiSnapshotTestHelper); they reference siblings + Moshi + internal-api.
+  testFixturesImplementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
+  testFixturesImplementation project(':dd-java-agent:agent-debugger:debugger-el')
+  testFixturesImplementation project(':internal-api')
+  testFixturesImplementation libs.moshi
+  testFixturesImplementation libs.junit.jupiter
+
   testImplementation libs.asm.util
   testImplementation libs.bundles.junit5
   testImplementation libs.junit.jupiter.params
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/LogProbeTestHelper.java b/dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/LogProbeTestHelper.java
similarity index 100%
rename from dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/LogProbeTestHelper.java
rename to dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/LogProbeTestHelper.java
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/MoshiSnapshotTestHelper.java b/dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/MoshiSnapshotTestHelper.java
similarity index 100%
rename from dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/MoshiSnapshotTestHelper.java
rename to dd-java-agent/agent-debugger/src/testFixtures/java/com/datadog/debugger/util/MoshiSnapshotTestHelper.java
diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-common/build.gradle
index 44e168aaf3d..9cdef640e2b 100644
--- a/dd-java-agent/instrumentation/mongo/mongo-common/build.gradle
+++ b/dd-java-agent/instrumentation/mongo/mongo-common/build.gradle
@@ -15,6 +15,5 @@ dependencies {
   testFixturesImplementation(project(':dd-java-agent:instrumentation-testing'))
   testFixturesImplementation group: 'org.testcontainers', name: 'mongodb', version: libs.versions.testcontainers.get()
 
-  //testImplementation project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output
   testImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/build.gradle b/dd-smoke-tests/debugger-integration-tests/build.gradle
index e07b7d6e7b6..da0000bcfee 100644
--- a/dd-smoke-tests/debugger-integration-tests/build.gradle
+++ b/dd-smoke-tests/debugger-integration-tests/build.gradle
@@ -17,8 +17,8 @@ dependencies {
   testImplementation project(':dd-java-agent:agent-debugger')
   testImplementation project(':dd-java-agent:agent-debugger:debugger-el')
   testImplementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
-  // dependency on some helper classes made only for tests
-  testImplementation project(':dd-java-agent:agent-debugger').sourceSets.test.output
+  // helper classes shared via java-test-fixtures (LogProbeTestHelper, MoshiSnapshotTestHelper)
+  testImplementation testFixtures(project(':dd-java-agent:agent-debugger'))
   testImplementation libs.bundles.junit5
   testImplementation libs.bundles.mockito
 }