diff --git a/build.gradle b/build.gradle
index fd9a2d0979..7e6c48c070 100644
--- a/build.gradle
+++ b/build.gradle
@@ -361,6 +361,11 @@ tasks.register('testWithJava21', Test) {
     javaLauncher = javaToolchains.launcherFor {
         languageVersion = JavaLanguageVersion.of(21)
     }
+    testClassesDirs = sourceSets.test.output.classesDirs
+    classpath = sourceSets.test.runtimeClasspath
+    classpath += sourceSets.jmh.output
+    dependsOn "jmhClasses"
+    dependsOn tasks.named('testClasses')
 }
 
 tasks.register('testWithJava17', Test) {