diff --git a/dd-java-agent/instrumentation/play/play-2.4/build.gradle b/dd-java-agent/instrumentation/play/play-2.4/build.gradle
index b67968733ed..7fef065ac1a 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/build.gradle
+++ b/dd-java-agent/instrumentation/play/play-2.4/build.gradle
@@ -2,27 +2,17 @@ muzzle {
   extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/")
 
   pass {
-    name = "play24and25"
     group = 'com.typesafe.play'
     module = 'play_2.11'
     versions = '[2.4.0,2.6)'
     assertInverse = true
   }
-  pass {
-    name = "play25only"
-    group = 'com.typesafe.play'
-    module = 'play_2.11'
-    versions = '[2.5.0,2.6)'
-    assertInverse = true
-  }
   fail {
-    name = "play24and25"
     group = 'com.typesafe.play'
     module = 'play_2.12'
     versions = '[,]'
   }
   fail {
-    name = "play24and25"
     group = 'com.typesafe.play'
     module = 'play_2.13'
     versions = '[,]'
@@ -30,7 +20,6 @@ muzzle {
 }
 
 apply from: "$rootDir/gradle/java.gradle"
-apply plugin: 'scala'
 
 testJvmConstraints {
   // Play doesn't work with Java 9+ until 2.6.12
@@ -46,154 +35,6 @@ repositories {
   }
 }
 
-tasks.withType(ScalaCompile).configureEach {
-  configureCompiler(it, 8)
-}
-
-addTestSuiteForDir('latestDepTest', 'test')
-
-sourceSets {
-  main_play25 {
-    java.srcDirs "${project.projectDir}/src/main/java_play25"
-  }
-}
-
-tasks.named("jar", Jar) {
-  from sourceSets.main_play25.output
-}
-
-project.afterEvaluate {
-  tasks.named('instrumentJava') { dependsOn 'compileMain_play25Java' }
-  tasks.named('forbiddenApisMain_play25') { dependsOn 'instrumentMain_play25Java' }
-}
-
-instrument {
-  additionalClasspath = [
-    instrumentJava: compileMain_play25Java.destinationDirectory
-  ]
-}
-
 dependencies {
   compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0'
-  main_play25CompileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.5.0'
-  main_play25CompileOnly project(':internal-api')
-  main_play25CompileOnly project(':dd-java-agent:agent-tooling')
-  main_play25CompileOnly project(':dd-java-agent:agent-bootstrap')
-
-  testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.0')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.1')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
-
-  // Before 2.5, play used netty 3.x which isn't supported, so for better test consistency, we test with just 2.5
-  testImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.0'
-  testImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.0'
-  testImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.0') {
-    exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
-  }
-  testRuntimeOnly sourceSets.main_play25.output
-
-  latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.+'
-  latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.+'
-  latestDepTestImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.+') {
-    exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
-  }
-}
-
-tasks.named("compileTestGroovy", GroovyCompile) {
-  classpath = classpath + files(tasks.named('compileTestScala').map { it.destinationDirectory })
-}
-
-tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  classpath = classpath + files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
-}
-
-sourceSets {
-  routeGenerator {
-    scala {
-      srcDir "${project.projectDir}/src/routeGenerator/scala"
-    }
-  }
-  testGenerated {
-    scala {
-      srcDir layout.buildDirectory.dir('generated/sources/testRoutes/scala')
-    }
-  }
-  latestDepTestGenerated {
-    scala {
-      srcDir layout.buildDirectory.dir('generated/sources/latestDepTestRoutes/scala')
-    }
-  }
-}
-
-dependencies {
-  routeGeneratorImplementation libs.scala211
-  routeGeneratorImplementation group: 'com.typesafe.play', name: "routes-compiler_2.11", version: '2.5.0'
-}
-
-configurations {
-  testGeneratedCompileClasspath.extendsFrom testCompileClasspath
-  latestDepTestGeneratedCompileClasspath.extendsFrom latestDepTestCompileClasspath
-}
-
-['buildTestRoutes', 'buildLatestDepTestRoutes'].each { taskName ->
-  tasks.register(taskName, JavaExec) {
-    String routesFile = "${project.projectDir}/src/test/routes/conf/routes"
-    def subdir = taskName == 'buildTestRoutes' ? 'testRoutes' : 'latestDepTestRoutes'
-    def outputDir =
-      layout.buildDirectory.dir("generated/sources/$subdir/scala")
-
-    it.inputs.file routesFile
-    it.outputs.dir outputDir
-
-    it.mainClass.set 'generator.CompileRoutes'
-    it.args routesFile, outputDir.get().asFile.absolutePath
-
-    it.classpath configurations.named('routeGeneratorRuntimeClasspath')
-    it.classpath tasks.named('compileRouteGeneratorScala').map { it.destinationDirectory }
-
-    if (taskName == 'buildTestRoutes') {
-      it.classpath tasks.named('compileTestScala').map { it.destinationDirectory }
-    } else {
-      it.classpath tasks.named('compileLatestDepTestScala').map { it.destinationDirectory }
-    }
-  }
-}
-
-tasks.named("compileTestGeneratedScala", ScalaCompile) {
-  classpath += files(tasks.named('compileTestScala').map { it.destinationDirectory })
-  dependsOn 'buildTestRoutes', 'compileLatestDepTestScala'
-}
-
-tasks.named("compileLatestDepTestGeneratedScala", ScalaCompile) {
-  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
-  dependsOn 'buildLatestDepTestRoutes'
-}
-
-tasks.named("compileTestGroovy", GroovyCompile) {
-  classpath += files(tasks.named('compileTestGeneratedScala').map { it.destinationDirectory })
-}
-
-tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  classpath += files(tasks.named('compileLatestDepTestGeneratedScala').map { it.destinationDirectory })
-}
-// do it this way rather than through dependencies {} because
-// latestDepTestImplementation extends testImplementation
-tasks.named("test", Test) {
-  classpath += files(tasks.named('compileTestGeneratedScala').map { it.destinationDirectory })
-}
-
-tasks.named("latestDepTest", Test) {
-  classpath += files(tasks.named('compileLatestDepTestGeneratedScala').map { it.destinationDirectory })
-}
-
-tasks.named("forbiddenApisTestGenerated") {
-  enabled = false
-}
-
-tasks.named("forbiddenApisLatestDepTestGenerated") {
-  enabled = false
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java
index 0a3515ed3bd..7b44d63a795 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java
@@ -19,11 +19,6 @@ public PlayInstrumentation() {
     super("play");
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "play24and25";
-  }
-
   @Override
   public String hierarchyMarkerType() {
     return "play.api.mvc.Action";
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/.gitignore b/dd-java-agent/instrumentation/play/play-appsec-2.5/.gitignore
new file mode 100644
index 00000000000..5292519a25e
--- /dev/null
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/.gitignore
@@ -0,0 +1 @@
+logs/
\ No newline at end of file
diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/build.gradle b/dd-java-agent/instrumentation/play/play-appsec-2.5/build.gradle
new file mode 100644
index 00000000000..6f10dfeebdd
--- /dev/null
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/build.gradle
@@ -0,0 +1,155 @@
+muzzle {
+  extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/")
+
+  pass {
+    group = 'com.typesafe.play'
+    module = 'play_2.11'
+    versions = '[2.5.0,2.6)'
+    assertInverse = true
+  }
+}
+
+apply from: "$rootDir/gradle/java.gradle"
+apply plugin: 'scala'
+
+testJvmConstraints {
+  // Play doesn't work with Java 9+ until 2.6.12
+  maxJavaVersion = JavaVersion.VERSION_1_8
+}
+
+repositories {
+  maven {
+    // for muzzle because of play-2.3
+    // only place that has 'com.typesafe.netty:netty-http-pipelining:1.1.2' publicly accessible
+    name = 'typesafe'
+    url = 'https://repo.typesafe.com/typesafe/maven-releases/'
+  }
+}
+
+tasks.withType(ScalaCompile).configureEach {
+  configureCompiler(it, 8)
+}
+
+addTestSuiteForDir('latestDepTest', 'test')
+
+dependencies {
+  compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.5.0'
+
+  testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.1')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
+
+  // All play modules for testing
+  testImplementation project(':dd-java-agent:instrumentation:play:play-2.4')
+
+  testImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.0'
+  testImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.0'
+  testImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.0') {
+    exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
+  }
+
+  latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.+'
+  latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.+'
+  latestDepTestImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.+') {
+    exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
+  }
+}
+
+tasks.named("compileTestGroovy", GroovyCompile) {
+  classpath = classpath + files(tasks.named('compileTestScala').map { it.destinationDirectory })
+}
+
+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
+  classpath = classpath + files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
+}
+
+sourceSets {
+  routeGenerator {
+    scala {
+      srcDir "${project.projectDir}/src/routeGenerator/scala"
+    }
+  }
+  testGenerated {
+    scala {
+      srcDir layout.buildDirectory.dir('generated/sources/testRoutes/scala')
+    }
+  }
+  latestDepTestGenerated {
+    scala {
+      srcDir layout.buildDirectory.dir('generated/sources/latestDepTestRoutes/scala')
+    }
+  }
+}
+
+dependencies {
+  routeGeneratorImplementation libs.scala211
+  routeGeneratorImplementation group: 'com.typesafe.play', name: "routes-compiler_2.11", version: '2.5.0'
+}
+
+configurations {
+  testGeneratedCompileClasspath.extendsFrom testCompileClasspath
+  latestDepTestGeneratedCompileClasspath.extendsFrom latestDepTestCompileClasspath
+}
+
+['buildTestRoutes', 'buildLatestDepTestRoutes'].each { taskName ->
+  tasks.register(taskName, JavaExec) {
+    String routesFile = "${project.projectDir}/src/test/routes/conf/routes"
+    def subdir = taskName == 'buildTestRoutes' ? 'testRoutes' : 'latestDepTestRoutes'
+    def outputDir =
+      layout.buildDirectory.dir("generated/sources/$subdir/scala")
+
+    it.inputs.file routesFile
+    it.outputs.dir outputDir
+
+    it.mainClass.set 'generator.CompileRoutes'
+    it.args routesFile, outputDir.get().asFile.absolutePath
+
+    it.classpath configurations.named('routeGeneratorRuntimeClasspath')
+    it.classpath tasks.named('compileRouteGeneratorScala').map { it.destinationDirectory }
+
+    if (taskName == 'buildTestRoutes') {
+      it.classpath tasks.named('compileTestScala').map { it.destinationDirectory }
+    } else {
+      it.classpath tasks.named('compileLatestDepTestScala').map { it.destinationDirectory }
+    }
+  }
+}
+
+tasks.named("compileTestGeneratedScala", ScalaCompile) {
+  classpath += files(tasks.named('compileTestScala').map { it.destinationDirectory })
+  dependsOn 'buildTestRoutes', 'compileLatestDepTestScala'
+}
+
+tasks.named("compileLatestDepTestGeneratedScala", ScalaCompile) {
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
+  dependsOn 'buildLatestDepTestRoutes'
+}
+
+tasks.named("compileTestGroovy", GroovyCompile) {
+  classpath += files(tasks.named('compileTestGeneratedScala').map { it.destinationDirectory })
+}
+
+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
+  classpath += files(tasks.named('compileLatestDepTestGeneratedScala').map { it.destinationDirectory })
+}
+// do it this way rather than through dependencies {} because
+// latestDepTestImplementation extends testImplementation
+tasks.named("test", Test) {
+  classpath += files(tasks.named('compileTestGeneratedScala').map { it.destinationDirectory })
+}
+
+tasks.named("latestDepTest", Test) {
+  classpath += files(tasks.named('compileLatestDepTestGeneratedScala').map { it.destinationDirectory })
+}
+
+tasks.named("forbiddenApisTestGenerated") {
+  enabled = false
+}
+
+tasks.named("forbiddenApisLatestDepTestGenerated") {
+  enabled = false
+}
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java
index 850d38b12da..27ec208ced6 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java
@@ -22,11 +22,6 @@ public String instrumentedType() {
     return "play.mvc.BodyParser$DelegatingBodyParser";
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "play25only";
-  }
-
   @Override
   public Reference[] additionalMuzzleReferences() {
     return MuzzleReferences.PLAY_25_ONLY;
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java
index cb4bd2b8e9c..a241d8adf13 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java
@@ -18,11 +18,6 @@ public FormUrlEncodedInstrumentation() {
     super("play");
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "play25only";
-  }
-
   @Override
   public Reference[] additionalMuzzleReferences() {
     return MuzzleReferences.PLAY_25_ONLY;
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java
similarity index 97%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java
index 64e9cbc216f..3cf041207fb 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java
@@ -31,11 +31,6 @@ public HttpErrorHandlerInstrumentation() {
     super("play");
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "play25only";
-  }
-
   @Override
   public Reference[] additionalMuzzleReferences() {
     return MuzzleReferences.PLAY_25_ONLY;
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java
index 3392458cd70..ba78f5d5472 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java
@@ -22,11 +22,6 @@ public PathPatternInstrumentation() {
     super("play");
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "play25only";
-  }
-
   @Override
   public Reference[] additionalMuzzleReferences() {
     return MuzzleReferences.PLAY_25_ONLY;
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java
similarity index 97%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java
index 73789c747c5..9cb53468cbd 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java
@@ -23,11 +23,6 @@ public PlayBodyParsersInstrumentation() {
     super("play");
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "play25only";
-  }
-
   @Override
   public Reference[] additionalMuzzleReferences() {
     return MuzzleReferences.PLAY_25_ONLY;
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java
similarity index 93%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java
index a9dce06f944..b48aa3f18a1 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java
@@ -15,11 +15,6 @@ public ResultsStatusInstrumentation() {
     super("play");
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "play25only";
-  }
-
   @Override
   public Reference[] additionalMuzzleReferences() {
     return MuzzleReferences.PLAY_25_ONLY;
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java
index 9d5b074e9c6..a548b58fb52 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java
@@ -19,11 +19,6 @@ public RoutingDslInstrumentation() {
     super("play");
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "play25only";
-  }
-
   @Override
   public Reference[] additionalMuzzleReferences() {
     return MuzzleReferences.PLAY_25_ONLY;
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java
index 75a10e1c9e4..3be2f0295be 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java
@@ -21,11 +21,6 @@ public SirdPathExtractorInstrumentation() {
     super("play");
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "play25only";
-  }
-
   @Override
   public Reference[] additionalMuzzleReferences() {
     return MuzzleReferences.PLAY_25_ONLY;
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java
similarity index 93%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java
index 31c71c3a1d0..c3362e119a9 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java
@@ -16,11 +16,6 @@ public StatusHeaderInstrumentation() {
     super("play");
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "play25only";
-  }
-
   @Override
   public Reference[] additionalMuzzleReferences() {
     return MuzzleReferences.PLAY_25_ONLY;
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java
index 2b29fce0459..57009e0e7f4 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java
@@ -22,11 +22,6 @@ public TolerantJsonInstrumentation() {
     super("play");
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "play25only";
-  }
-
   @Override
   public Reference[] additionalMuzzleReferences() {
     return MuzzleReferences.PLAY_25_ONLY;
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java
index d4589b28e67..dbc99ee28c1 100644
--- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java
+++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java
@@ -17,11 +17,6 @@ public TolerantTextInstrumentation() {
     super("play");
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "play25only";
-  }
-
   @Override
   public Reference[] additionalMuzzleReferences() {
     return MuzzleReferences.PLAY_25_ONLY;
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/routeGenerator/scala/generator/CompileRoutes.scala b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/routeGenerator/scala/generator/CompileRoutes.scala
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/routeGenerator/scala/generator/CompileRoutes.scala
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/routeGenerator/scala/generator/CompileRoutes.scala
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/routes/conf/routes b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/routes/conf/routes
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/test/routes/conf/routes
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/routes/conf/routes
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala
diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/Util.scala b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/scala/datadog/trace/instrumentation/play25/Util.scala
similarity index 100%
rename from dd-java-agent/instrumentation/play/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/Util.scala
rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/scala/datadog/trace/instrumentation/play25/Util.scala
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0ce925c46a0..de8b539d9c0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -498,6 +498,7 @@ include(
   ":dd-java-agent:instrumentation:play-ws:play-ws-common",
   ":dd-java-agent:instrumentation:play:play-2.3",
   ":dd-java-agent:instrumentation:play:play-2.4",
+  ":dd-java-agent:instrumentation:play:play-appsec-2.5",
   ":dd-java-agent:instrumentation:play:play-2.6",
   ":dd-java-agent:instrumentation:protobuf-3.0",
   ":dd-java-agent:instrumentation:quartz-2.0",