diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DifferentClassloadersIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DifferentClassloadersIT.kt
index c668e1c35a3..9052056d2f6 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DifferentClassloadersIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DifferentClassloadersIT.kt
@@ -84,8 +84,8 @@ class DifferentClassloadersIT : KGPBaseTest() {
         }
         subProject("js-app").buildGradle.modify {
             it.checkedReplace(
-                "id \"kotlin2js\"",
-                "id \"kotlin2js\" version \"${TestVersions.Kotlin.CURRENT}\""
+                "id \"org.jetbrains.kotlin.js\"",
+                "id \"org.jetbrains.kotlin.js\" version \"${TestVersions.Kotlin.CURRENT}\""
             )
         }
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt
index 023001d20dd..511206c6cbc 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt
@@ -99,8 +99,13 @@ class UpToDateIT : KGPBaseTest() {
         val originalPaths get() = originalCompilerCp.map { it.replace("\\", "/") }.joinToString(", ") { "'$it'" }
 
         override fun initProject(project: TestProject) = with(project) {
+            val pluginSuffix = if (project.gradleVersion < GradleVersion.version("7.0")) {
+                "kotlin_gradle_plugin"
+            } else {
+                "kotlin_gradle_plugin_gradle70"
+            }
             buildGradle.appendText(
-                "\nafterEvaluate { println 'compiler_cp=' + compileKotlin.getDefaultCompilerClasspath\$kotlin_gradle_plugin().toList() }"
+                "\nafterEvaluate { println 'compiler_cp=' + compileKotlin.getDefaultCompilerClasspath\$$pluginSuffix().toList() }"
             )
             build("clean") {
                 originalCompilerCp = compilerClasspathRegex.find(output)!!.groupValues[1].split(", ")
@@ -111,9 +116,9 @@ class UpToDateIT : KGPBaseTest() {
                 
                 // Add Kapt to the project to test its input checks as well:
                 apply plugin: 'kotlin-kapt'
-                compileKotlin.getDefaultCompilerClasspath${'$'}kotlin_gradle_plugin().setFrom(files($originalPaths).toList())
+                compileKotlin.getDefaultCompilerClasspath${'$'}$pluginSuffix().setFrom(files($originalPaths).toList())
                 afterEvaluate {
-                    kaptGenerateStubsKotlin.getDefaultCompilerClasspath${'$'}kotlin_gradle_plugin().setFrom(files($originalPaths).toList())
+                    kaptGenerateStubsKotlin.getDefaultCompilerClasspath${'$'}$pluginSuffix().setFrom(files($originalPaths).toList())
                 }
                 """.trimIndent()
             )
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/differentClassloaders/js-app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/differentClassloaders/js-app/build.gradle
index 668f0a8b88f..088a2dc8fed 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/differentClassloaders/js-app/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/differentClassloaders/js-app/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "kotlin2js"
     id "maven-publish"
     id "org.jetbrains.kotlin.plugin.serialization"
+    id "org.jetbrains.kotlin.js"
 }
 
 group = "com.example"
@@ -28,14 +28,3 @@ if (project.findProperty("mppProjectDependency") == "true") {
     }
 
 }
-
-publishing {
-    publications {
-        main(MavenPublication) {
-            from components.java
-        }
-    }
-    repositories {
-        maven { setUrl("${rootProject.buildDir}/repo") }
-    }
-}
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle
index 8e0de6e44ee..09e5cf9589e 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle
@@ -1,7 +1,16 @@
-plugins {
-    id "kotlin2js"
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
+    }
 }
 
+apply plugin: "kotlin2js"
+
 repositories {
     mavenLocal()
     mavenCentral()