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 1531f9f1247..e8d6c910297 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -14,33 +14,34 @@ pill {
 val kotlinGradlePluginTest = project(":kotlin-gradle-plugin").sourceSets.getByName("test")
 
 dependencies {
-    testCompile(project(":kotlin-gradle-plugin"))
-    testCompile(kotlinGradlePluginTest.output)
-    testCompile(project(":kotlin-gradle-subplugin-example"))
-    testCompile(project(":kotlin-allopen"))
-    testCompile(project(":kotlin-noarg"))
-    testCompile(project(":kotlin-sam-with-receiver"))
-    testCompile(project(":kotlin-test:kotlin-test-jvm"))
-    testCompile(project(":native:kotlin-native-utils"))
+    testImplementation(project(":kotlin-gradle-plugin"))
+    testImplementation(kotlinGradlePluginTest.output)
+    testImplementation(project(":kotlin-gradle-subplugin-example"))
+    testImplementation(project(":kotlin-allopen"))
+    testImplementation(project(":kotlin-noarg"))
+    testImplementation(project(":kotlin-sam-with-receiver"))
+    testImplementation(project(":kotlin-test:kotlin-test-jvm"))
+    testImplementation(project(":native:kotlin-native-utils"))
 
-    testCompile(projectRuntimeJar(":kotlin-compiler-embeddable"))
-    testCompile(intellijCoreDep()) { includeJars("jdom") }
+    testImplementation(projectRuntimeJar(":kotlin-compiler-embeddable"))
+    testImplementation(intellijCoreDep()) { includeJars("jdom") }
     // testCompileOnly dependency on non-shaded artifacts is needed for IDE support
-    // testRuntime on shaded artifact is needed for running tests with shaded compiler
+    // testRuntimeOnly on shaded artifact is needed for running tests with shaded compiler
     testCompileOnly(project(path = ":kotlin-gradle-plugin-test-utils-embeddable", configuration = "compile"))
-    testRuntime(projectRuntimeJar(":kotlin-gradle-plugin-test-utils-embeddable"))
+    testRuntimeOnly(projectRuntimeJar(":kotlin-gradle-plugin-test-utils-embeddable"))
 
-    testCompile(project(path = ":examples:annotation-processor-example"))
-    testCompile(kotlinStdlib("jdk8"))
-    testCompile(project(":kotlin-reflect"))
-    testCompile(project(":kotlin-android-extensions"))
-    testCompile(project(":kotlin-parcelize-compiler"))
-    testCompile(commonDep("org.jetbrains.intellij.deps", "trove4j"))
+    testImplementation(project(path = ":examples:annotation-processor-example"))
+    testImplementation(kotlinStdlib("jdk8"))
+    testImplementation(project(":kotlin-reflect"))
+    testImplementation(project(":kotlin-android-extensions"))
+    testImplementation(project(":kotlin-parcelize-compiler"))
+    testImplementation(commonDep("org.jetbrains.intellij.deps", "trove4j"))
 
-    testCompile(gradleApi())
+    testImplementation(gradleApi())
+    testImplementation("com.google.code.gson:gson:${rootProject.extra["versions.jar.gson"]}")
 
-    testRuntime(projectRuntimeJar(":kotlin-android-extensions"))
-    testRuntime(project(":compiler:tests-mutes"))
+    testRuntimeOnly(projectRuntimeJar(":kotlin-android-extensions"))
+    testRuntimeOnly(project(":compiler:tests-mutes"))
 
     // Workaround for missing transitive import of the common(project `kotlin-test-common`
     // for `kotlin-test-jvm` into the IDE:
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
index dda3080ad94..d0f46edc9ee 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
@@ -34,14 +34,14 @@ pill {
 }
 
 dependencies {
-    compile(project(":kotlin-gradle-plugin-api"))
-    compile(project(":kotlin-gradle-plugin-model"))
+    api(project(":kotlin-gradle-plugin-api"))
+    api(project(":kotlin-gradle-plugin-model"))
     compileOnly(project(":compiler"))
     compileOnly(project(":compiler:incremental-compilation-impl"))
     compileOnly(project(":daemon-common"))
 
-    compile(kotlinStdlib())
-    compile(project(":kotlin-util-klib"))
+    implementation(kotlinStdlib())
+    implementation(project(":kotlin-util-klib"))
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(project(":kotlin-android-extensions"))
     compileOnly(project(":kotlin-build-common"))
@@ -54,8 +54,8 @@ dependencies {
     compileOnly(project(":kotlin-gradle-build-metrics"))
     embedded(project(":kotlin-gradle-build-metrics"))
 
-    compile("com.google.code.gson:gson:${rootProject.extra["versions.jar.gson"]}")
-    compile("de.undercouch:gradle-download-task:4.0.2")
+    implementation("com.google.code.gson:gson:${rootProject.extra["versions.jar.gson"]}")
+    implementation("de.undercouch:gradle-download-task:4.0.2")
     implementation("com.github.gundy:semver4j:0.16.4:nodeps") {
         exclude(group = "*")
     }
@@ -89,15 +89,15 @@ dependencies {
         because("Functional tests are using APIs from Android. Latest Version is used to avoid NoClassDefFoundError")
     }
 
-    testCompile(intellijDep()) { includeJars("junit", "serviceMessages", rootProject = rootProject) }
+    testImplementation(intellijDep()) { includeJars("junit", "serviceMessages", rootProject = rootProject) }
 
     testCompileOnly(project(":compiler"))
-    testCompile(projectTests(":kotlin-build-common"))
-    testCompile(project(":kotlin-android-extensions"))
-    testCompile(project(":kotlin-compiler-runner"))
-    testCompile(project(":kotlin-test::kotlin-test-junit"))
-    testCompile("junit:junit:4.12")
-    testCompile(project(":kotlin-gradle-statistics"))
+    testImplementation(projectTests(":kotlin-build-common"))
+    testImplementation(project(":kotlin-android-extensions"))
+    testImplementation(project(":kotlin-compiler-runner"))
+    testImplementation(project(":kotlin-test::kotlin-test-junit"))
+    testImplementation("junit:junit:4.12")
+    testImplementation(project(":kotlin-gradle-statistics"))
     testCompileOnly(project(":kotlin-reflect-api"))
     testCompileOnly(project(":kotlin-annotation-processing"))
     testCompileOnly(project(":kotlin-annotation-processing-gradle"))