diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts
index e6bb6e38327..ff01d6e1deb 100644
--- a/core/descriptors.runtime/build.gradle.kts
+++ b/core/descriptors.runtime/build.gradle.kts
@@ -24,8 +24,15 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-jvmTarget = "1.6"
-javaHome = rootProject.extra["JDK_16"] as String
+val compileJava by tasks.getting(JavaCompile::class) {
+    sourceCompatibility = "1.6"
+    targetCompatibility = "1.6"
+}
+
+val compileKotlin by tasks.getting(KotlinCompile::class) {
+    kotlinOptions.jvmTarget = "1.6"
+    kotlinOptions.jdkHome = rootProject.extra["JDK_16"] as String
+}
 
 val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateRuntimeDescriptorTestsKt")