diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle
index d2d9001f4b1..d95e9432796 100644
--- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle
+++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle
@@ -8,9 +8,6 @@ apply from: "$rootDir/gradle/slf4j-simple.gradle"
 
 testJvmConstraints {
   minJavaVersion = JavaVersion.VERSION_21
-  // Structured concurrency is a preview feature in Java 21. Methods (e.g. ShutdownOnFailure) used in this instrumentation test are no longer available in Java 25, so we set the max version to 24.
-  // See: https://download.java.net/java/early_access/loom/docs/api/java.base/java/util/concurrent/StructuredTaskScope.html
-  maxJavaVersion = JavaVersion.VERSION_24
 }
 
 muzzle {
@@ -30,6 +27,14 @@ idea {
  */
 addTestSuite('previewTest')
 
+tasks.named("previewTest").configure {
+  testJvmConstraints {
+    // Structured concurrency is a preview feature in Java 21. Methods (e.g. ShutdownOnFailure) used in this instrumentation test are no longer available in Java 25, so we set the max version to 24.
+    // See: https://download.java.net/java/early_access/loom/docs/api/java.base/java/util/concurrent/StructuredTaskScope.html
+    maxJavaVersion = JavaVersion.VERSION_24
+  }
+}
+
 // Set all compile tasks to use JDK21 but let instrumentation code targets 1.8 compatibility
 tasks.withType(AbstractCompile).configureEach {
   configureCompiler(it, 21, JavaVersion.VERSION_1_8)