diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/database/SharedDBCommenterTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterForkedTest.groovy
similarity index 96%
rename from dd-trace-core/src/test/groovy/datadog/trace/core/database/SharedDBCommenterTest.groovy
rename to dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterForkedTest.groovy
index 8b91c010e24..c655b5c1f97 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/database/SharedDBCommenterTest.groovy
+++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenterForkedTest.groovy
@@ -1,9 +1,8 @@
-package datadog.trace.core.database
+package datadog.trace.bootstrap.instrumentation.dbm
 
-import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter
 import spock.lang.Specification
 
-class SharedDBCommenterTest extends Specification {
+class SharedDBCommenterForkedTest extends Specification {
   def setup() {
     System.setProperty("dd.service.name", "test-service")
     System.setProperty("dd.env", "test-env")