diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/settings/GradleDaemonJvmCriteriaViewFactoryTest.kt b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/settings/GradleDaemonJvmCriteriaViewFactoryTest.kt
index a429439f7d76..a9feb399454a 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/settings/GradleDaemonJvmCriteriaViewFactoryTest.kt
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/settings/GradleDaemonJvmCriteriaViewFactoryTest.kt
@@ -59,8 +59,9 @@ class GradleDaemonJvmCriteriaViewFactoryTest : GradleDaemonJvmCriteriaViewFactor
 
   @Test
   fun `test Given created view Then dropdown items are the expected ones`() {
-    createDaemonJvmCriteriaView(GradleVersion.version("8.9")).run {
-      assertVersionDropdownItems()
+    val gradleVersion = GradleVersion.current()
+    createDaemonJvmCriteriaView(gradleVersion).run {
+      assertVersionDropdownItems(gradleVersion)
       assertVendorDropdownItems()
     }
   }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/settings/GradleDaemonJvmCriteriaViewFactoryTestCase.kt b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/settings/GradleDaemonJvmCriteriaViewFactoryTestCase.kt
index 06302b577568..98d7d02366ef 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/settings/GradleDaemonJvmCriteriaViewFactoryTestCase.kt
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/settings/GradleDaemonJvmCriteriaViewFactoryTestCase.kt
@@ -2,12 +2,12 @@
 package org.jetbrains.plugins.gradle.service.settings
 
 import com.intellij.openapi.Disposable
-import com.intellij.pom.java.JavaRelease
 import com.intellij.testFramework.junit5.TestApplication
 import com.intellij.testFramework.junit5.TestDisposable
 import com.intellij.ui.dsl.builder.impl.CollapsibleTitledSeparatorImpl
 import com.intellij.util.ui.UIUtil
 import org.gradle.util.GradleVersion
+import org.jetbrains.plugins.gradle.jvmcompat.GradleJvmSupportMatrix
 import org.jetbrains.plugins.gradle.service.settings.GradleDaemonJvmCriteriaView.VendorItem
 import org.jetbrains.plugins.gradle.service.settings.GradleDaemonJvmCriteriaView.VersionItem
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -38,15 +38,15 @@ abstract class GradleDaemonJvmCriteriaViewFactoryTestCase {
     assertEquals(isVisible, advancedSettingsComponent?.isVisible)
   }
 
-  fun GradleDaemonJvmCriteriaView.assertVersionDropdownItems() {
-    val expectedVersionList = JavaRelease.getHighest().toJavaVersion().feature.downTo(8)
-    expectedVersionList.forEachIndexed { index, expectedVersion ->
-      val actualVersion = when (val versionItem = versionModel.getElementAt(index)) {
-        is VersionItem.Default -> versionItem.version.toString()
-        is VersionItem.Custom -> throw AssertionError("Unexpected custom version item: " + versionItem.value)
+  fun GradleDaemonJvmCriteriaView.assertVersionDropdownItems(gradleVersion: GradleVersion) {
+    val expectedVersionList = GradleJvmSupportMatrix.getSupportedJavaVersions(gradleVersion)
+    expectedVersionList.reversed().forEachIndexed { index, expectedVersion ->
+        val actualVersion = when (val versionItem = versionModel.getElementAt(index)) {
+          is VersionItem.Default -> versionItem.version
+          is VersionItem.Custom -> throw AssertionError("Unexpected custom version item: " + versionItem.value)
+        }
+        assertEquals(expectedVersion.feature, actualVersion)
       }
-      assertEquals(expectedVersion.toString(), actualVersion)
-    }
   }
 
   fun GradleDaemonJvmCriteriaView.assertVendorDropdownItems() {