diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
index 85954604f06..b579bc334a5 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -44,37 +44,12 @@ dependencies {
     testCompileOnly(project(":kotlin-test:kotlin-test-common")) { isTransitive = false }
 }
 
-projectTest {
-    executable = "${rootProject.extra["JDK_18"]!!}/bin/java"
-    dependsOn(":kotlin-gradle-plugin:validateTaskProperties")
-    dependsOn(
-        ":kotlin-allopen:install",
-        ":kotlin-allopen:plugin-marker:install",
-        ":kotlin-noarg:install",
-        ":kotlin-allopen:plugin-marker:install",
-        ":kotlin-sam-with-receiver:install",
-        ":kotlin-android-extensions:install",
-        ":kotlin-build-common:install",
-        ":kotlin-compiler-embeddable:install",
-        ":kotlin-gradle-plugin:install",
-        ":kotlin-gradle-plugin:plugin-marker:install",
-        ":kotlin-reflect:install",
-        ":kotlin-annotation-processing-gradle:install",
-        ":kotlin-test:kotlin-test-jvm:install",
-        ":kotlin-gradle-subplugin-example:install",
-        ":kotlin-stdlib-jdk8:install",
-        ":examples:annotation-processor-example:install",
-        ":kotlin-scripting-common:install",
-        ":kotlin-scripting-jvm:install",
-        ":kotlin-scripting-compiler-embeddable:install",
-        ":kotlin-test-nodejs-runner:install"
-    )
-}
+// additional configuration in tasks.withType<Test> below
+projectTest("test") {}
 
-tasks.register<Test>("testAdvanceGradleVersion") {
+projectTest("testAdvanceGradleVersion") {
     val gradleVersionForTests = "5.3-rc-2"
     systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests)
-    dependsOn(tasks.getByName("test").dependsOn)
 }
 
 tasks.named<Task>("check") {
@@ -112,6 +87,30 @@ tasks.withType<KotlinCompile> {
 tasks.withType<Test> {
     onlyIf { !project.hasProperty("noTest") }
 
+    dependsOn(":kotlin-gradle-plugin:validateTaskProperties")
+    dependsOn(
+        ":kotlin-allopen:install",
+        ":kotlin-allopen:plugin-marker:install",
+        ":kotlin-noarg:install",
+        ":kotlin-allopen:plugin-marker:install",
+        ":kotlin-sam-with-receiver:install",
+        ":kotlin-android-extensions:install",
+        ":kotlin-build-common:install",
+        ":kotlin-compiler-embeddable:install",
+        ":kotlin-gradle-plugin:install",
+        ":kotlin-gradle-plugin:plugin-marker:install",
+        ":kotlin-reflect:install",
+        ":kotlin-annotation-processing-gradle:install",
+        ":kotlin-test:kotlin-test-jvm:install",
+        ":kotlin-gradle-subplugin-example:install",
+        ":kotlin-stdlib-jdk8:install",
+        ":examples:annotation-processor-example:install",
+        ":kotlin-scripting-common:install",
+        ":kotlin-scripting-jvm:install",
+        ":kotlin-scripting-compiler-embeddable:install",
+        ":kotlin-test-nodejs-runner:install"
+    )
+
     executable = "${rootProject.extra["JDK_18"]!!}/bin/java"
 
     systemProperty("kotlinVersion", rootProject.extra["kotlinVersion"] as String)