diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/BuildParameterExtension.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/BuildParameterExtension.java
index e80dc6ef1b44c..cb0fa714b3f3d 100644
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/BuildParameterExtension.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/BuildParameterExtension.java
@@ -67,4 +67,6 @@ public interface BuildParameterExtension {
     Random getRandom();
 
     Boolean isGraalVmRuntime();
+
+    void withMinimumJavaRuntimeVersion(JavaVersion version, Runnable runnable);
 }
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/DefaultBuildParameterExtension.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/DefaultBuildParameterExtension.java
index faac406d974c6..56473c3e87232 100644
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/DefaultBuildParameterExtension.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/DefaultBuildParameterExtension.java
@@ -242,4 +242,10 @@ public void setBwcVersions(Provider<BwcVersions> bwcVersions) {
     public void setGitOrigin(String gitOrigin) {
         this.gitOrigin = gitOrigin;
     }
+
+    public void withMinimumJavaRuntimeVersion(JavaVersion version, Runnable runnable) {
+        if (runtimeJavaVersion.get().isCompatibleWith(version)) {
+            runnable.run();
+        }
+    }
 }
diff --git a/libs/simdvec/build.gradle b/libs/simdvec/build.gradle
index 95b8ddf28cf2f..801def41e1e1c 100644
--- a/libs/simdvec/build.gradle
+++ b/libs/simdvec/build.gradle
@@ -32,7 +32,7 @@ tasks.matching { it.name == "compileMain21Java" }.configureEach {
 }
 
 tasks.named('test').configure {
-  if (buildParams.getRuntimeJavaVersion().map{ it.majorVersion.toInteger() }.get() >= 21) {
+  buildParams.withMinimumJavaRuntimeVersion(JavaVersion.VERSION_21) {
     jvmArgs '--add-modules=jdk.incubator.vector'
   }
 }
diff --git a/modules/analysis-common/build.gradle b/modules/analysis-common/build.gradle
index 9e7932bbf6673..0730b4e862302 100644
--- a/modules/analysis-common/build.gradle
+++ b/modules/analysis-common/build.gradle
@@ -39,7 +39,7 @@ tasks.named("yamlRestCompatTestTransform").configure { task ->
 }
 
 tasks.named("yamlRestTest").configure {
-  if (buildParams.getRuntimeJavaVersion().map{ it.majorVersion.toInteger() }.get() >= 24 ||
+  if (buildParams.getRuntimeJavaVersion().get().isCompatibleWith(JavaVersion.VERSION_24) ||
     "-Des.entitlements.enabled=true".equals(System.getProperty("tests.jvm.argline"))) {
     systemProperty 'tests.rest.blacklist',
       [