diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts
index 2769874b432..789490d6546 100644
--- a/compiler/tests-different-jdk/build.gradle.kts
+++ b/compiler/tests-different-jdk/build.gradle.kts
@@ -63,14 +63,23 @@ codegenTest(target = 6, jvm = 6, jdk = "JDK_18") {
     }
 }
 
-codegenTest(target = 6, jvm = 9) {}
-
 codegenTest(target = 8, jvm = 8) {}
 
+// Switch TC builds to...
+codegenTest(target = 6, jvm = 11) {}
+
+codegenTest(target = 8, jvm = 11) {}
+
+codegenTest(target = 11, jvm = 11) {}
+
+//...and delete old tasks..
+codegenTest(target = 6, jvm = 9) {}
+
 codegenTest(target = 8, jvm = 9) {}
 
 codegenTest(target = 9, jvm = 9) {}
 
+//..also add this two tasks to build after adding fresh jdks to build agents
 val mostRecentJdk = JdkMajorVersion.values().last().name
 
 codegenTest(target = 6, jvm = "Last", jdk = mostRecentJdk) {
diff --git a/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt b/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt
index 8bf8232d006..941cd77b7d0 100644
--- a/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt
+++ b/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt
@@ -81,13 +81,13 @@ class JvmTarget6OnJvm6 : CustomJvmTargetOnJvmBaseTest() {
 class JvmTarget8OnJvm8 : CustomJvmTargetOnJvmBaseTest()
 
 @RunWith(SuiteRunnerForCustomJdk::class)
-class JvmTarget6OnJvm9 : CustomJvmTargetOnJvmBaseTest()
+class JvmTarget6OnJvm11 : CustomJvmTargetOnJvmBaseTest()
 
 @RunWith(SuiteRunnerForCustomJdk::class)
-class JvmTarget8OnJvm9 : CustomJvmTargetOnJvmBaseTest()
+class JvmTarget8OnJvm11 : CustomJvmTargetOnJvmBaseTest()
 
 @RunWith(SuiteRunnerForCustomJdk::class)
-class JvmTarget9OnJvm9 : CustomJvmTargetOnJvmBaseTest()
+class JvmTarget11OnJvm11 : CustomJvmTargetOnJvmBaseTest()
 
 @RunWith(SuiteRunnerForCustomJdk::class)
 class JvmTarget6OnJvmLast : CustomJvmTargetOnJvmBaseTest()
@@ -97,3 +97,14 @@ class JvmTarget8OnJvmLast : CustomJvmTargetOnJvmBaseTest()
 
 @RunWith(SuiteRunnerForCustomJdk::class)
 class JvmTargetLastOnJvmLast : CustomJvmTargetOnJvmBaseTest()
+
+//TODO: delete old tasks
+@RunWith(SuiteRunnerForCustomJdk::class)
+class JvmTarget6OnJvm9 : CustomJvmTargetOnJvmBaseTest()
+
+@RunWith(SuiteRunnerForCustomJdk::class)
+class JvmTarget8OnJvm9 : CustomJvmTargetOnJvmBaseTest()
+
+@RunWith(SuiteRunnerForCustomJdk::class)
+class JvmTarget9OnJvm9 : CustomJvmTargetOnJvmBaseTest()
+