diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index d303d359437c..364a04fae552 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -31,6 +31,8 @@ jobs:
         - version: 24
           type: ea
           release: leyden
+        - version: 25
+          type: ea
     name: "OpenJDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }})"
     runs-on: ubuntu-latest
     steps:
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc
index ee08a53eed41..ed1b63eaa2a4 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc
@@ -45,7 +45,7 @@ JUnit repository on GitHub.
 [[release-notes-5.11.4-junit-jupiter-new-features-and-improvements]]
 ==== New Features and Improvements
 
-* ❓
+* `JAVA_25` has been added to the `JRE` enum for use with JRE-based execution conditions.
 
 
 [[release-notes-5.11.4-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc
index 41eeda5831b1..6794f04a77c5 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc
@@ -118,7 +118,7 @@ JUnit repository on GitHub.
   thread dump to `System.out` prior to interrupting a test thread due to a timeout.
 * `TestReporter` now allows publishing files for a test method or test class which can be
   used to include them in test reports, such as the Open Test Reporting format.
-
+* `JAVA_25` has been added to the `JRE` enum for use with JRE-based execution conditions.
 
 [[release-notes-5.12.0-M1-junit-vintage]]
 === JUnit Vintage
diff --git a/gradle/base/code-generator-model/src/main/resources/jre.yaml b/gradle/base/code-generator-model/src/main/resources/jre.yaml
index ed1bdd3d59fc..1747ffa12dd6 100644
--- a/gradle/base/code-generator-model/src/main/resources/jre.yaml
+++ b/gradle/base/code-generator-model/src/main/resources/jre.yaml
@@ -28,3 +28,5 @@
   since: '5.11'
 - version: 24
   since: '5.11'
+- version: 25
+  since: '5.11.4'