diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index f70fec93e..9713cf4c8 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - gradle-argument: 'assemble && ./gradlew check -x test -x testng -x testngWithJava11 -x testngWithJava17 -x testngWithJava21'
+          - gradle-argument: 'assemble && ./gradlew check -x test -x testng'
             label: 'check'
           - gradle-argument: 'testWithJava11 testngWithJava11'
             label: 'java11'
@@ -23,7 +23,7 @@ jobs:
           - gradle-argument: 'testWithJava21 testngWithJava21'
             label: 'java21'
             test-results-dirs: 'testWithJava21 testngWithJava21'
-          - gradle-argument: 'test -x testWithJava11 -x testWithJava17 -x testWithJava21 testng jacocoTestReport'
+          - gradle-argument: 'test testng jacocoTestReport'
             label: 'java25'
             test-results-dirs: 'test testng'
           - gradle-argument: 'jcstress'
@@ -220,4 +220,4 @@ jobs:
           java-version: '25'
           distribution: 'corretto'
       - name: publishToMavenCentral
-        run: ./gradlew assemble && ./gradlew check -x test -x testng -x testngWithJava11 -x testngWithJava17 -x testngWithJava21 --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace
+        run: ./gradlew assemble && ./gradlew check -x test -x testng --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 6b216b047..44d756153 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - gradle-argument: 'assemble && ./gradlew check -x test -x testng -x testngWithJava11 -x testngWithJava17 -x testngWithJava21'
+          - gradle-argument: 'assemble && ./gradlew check -x test -x testng'
             label: 'check'
           - gradle-argument: 'testWithJava11 testngWithJava11'
             label: 'java11'
@@ -31,7 +31,7 @@ jobs:
           - gradle-argument: 'testWithJava21 testngWithJava21'
             label: 'java21'
             test-results-dirs: 'testWithJava21 testngWithJava21'
-          - gradle-argument: 'test -x testWithJava11 -x testWithJava17 -x testWithJava21 testng jacocoTestReport'
+          - gradle-argument: 'test testng jacocoTestReport'
             label: 'java25'
             test-results-dirs: 'test testng'
           - gradle-argument: 'jcstress'
diff --git a/AGENTS.md b/AGENTS.md
index 3ac0eb552..d5e6e5dd6 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -14,8 +14,8 @@
 
 ## Test Execution
 
-When running tests, exclude the Java version-specific test tasks to avoid failures:
-
 ```bash
-./gradlew test -x testWithJava21 -x testWithJava17 -x testWithJava11 -x testng
+./gradlew test
 ```
+
+This runs tests on Java 25 only. Other JVM versions (11, 17, 21) require explicit tasks (e.g. `testWithJava11`).
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 000000000..f4876c26a
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1 @@
+See [AGENTS.md](AGENTS.md)
diff --git a/build.gradle b/build.gradle
index e5ae04e9a..c11619a6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -406,8 +406,6 @@ task testng(type: Test) {
     dependsOn tasks.named('testClasses')
     doLast { verifyTestngSkips(it, expectedTestngSkips) }
 }
-check.dependsOn testng
-
 compileJava {
     options.compilerArgs += ["-parameters"]
     source file("build/generated-src"), sourceSets.main.java
@@ -563,9 +561,6 @@ tasks.register('testWithJava11', Test) {
     }
 }
 
-test.dependsOn testWithJava21
-test.dependsOn testWithJava17
-test.dependsOn testWithJava11
 
 jacoco {
     toolVersion = "0.8.12"