diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt
index 00b354940c5..6b07e484da8 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt
@@ -26,25 +26,26 @@ import com.intellij.testFramework.ExpectedHighlightingData
 import com.intellij.testFramework.VfsTestUtil
 import com.intellij.testFramework.runInEdtAndWait
 import junit.framework.TestCase
-import org.jetbrains.kotlin.idea.codeInsight.gradle.GradleImportingTestCase
+import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
+import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.TagsTestDataUtil
 import org.jetbrains.kotlin.test.TagsTestDataUtil.TagInfo
-import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions
+import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
 import org.junit.Assert
 import org.junit.Test
 import java.io.File
 
-class GradleMultiplatformHighlightingTest : GradleImportingTestCase() {
+class GradleMultiplatformHighlightingTest : MultiplePluginVersionGradleImportingTestCase() {
 
-    @TargetVersions("4.7+")
     @Test
+    @PluginTargetVersions(gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
     fun testFirst() {
         doTest()
     }
 
-    @TargetVersions("4.7+")
     @Test
+    @PluginTargetVersions(gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
     fun testNoErrors() {
         doTest()
     }
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt
index 7c1ce0f4d4d..8ab9d55198b 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt
@@ -18,9 +18,6 @@ import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
 import org.junit.Test
 
-// TODO: run this test on the Gradle plugin from the current build
-//  1. specify appropriate 'pluginVersion' in [PluginTargetVersions]
-//  2. avoid using fixed Gradle plugin version in testdata
 class ImportAndCheckNavigation : MultiplePluginVersionGradleImportingTestCase() {
 
     @Test
diff --git a/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/build.gradle.kts b/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/build.gradle.kts
index 491d55a8b5b..7479ef5b438 100644
--- a/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/build.gradle.kts
+++ b/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/build.gradle.kts
@@ -1,21 +1,19 @@
 buildscript {
     repositories {
-        maven("https://dl.bintray.com/kotlin/kotlin-dev") // TODO: use the Gradle plugin from the current build
-        mavenCentral()
+        {{kts_kotlin_plugin_repositories}}
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0-dev-7568") // TODO: use the Gradle plugin from the current build
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
     }
 }
 
 plugins {
-    kotlin("multiplatform")
+    kotlin("multiplatform").version("{{kotlin_plugin_version}}")
 }
 
 repositories {
-    maven("https://dl.bintray.com/kotlin/kotlin-dev") // TODO: use the Gradle plugin from the current build
-    mavenCentral()
+    {{kts_kotlin_plugin_repositories}}
 }
 
 kotlin {
diff --git a/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/settings.gradle.kts b/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/settings.gradle.kts
index dd27e7f771f..a4a34729dfc 100644
--- a/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/settings.gradle.kts
+++ b/idea/testData/gradle/importAndCheckNavigation/navigationToCommonizedLibrary/settings.gradle.kts
@@ -1,16 +1,8 @@
 pluginManagement {
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.name == "multiplatform") {
-                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0-dev-7568") // TODO: use the Gradle plugin from the current build
-            }
-        }
-    }
-
     repositories {
-        maven("https://dl.bintray.com/kotlin/kotlin-dev") // TODO: use the Gradle plugin from the current build
-        gradlePluginPortal()
+        {{kts_kotlin_plugin_repositories}}
     }
 }
 
+
 rootProject.name = "test"
diff --git a/idea/testData/gradle/newMultiplatformHighlighting/first/build.gradle b/idea/testData/gradle/newMultiplatformHighlighting/first/build.gradle
index 29adfe9c1e3..d4af92d6ca3 100644
--- a/idea/testData/gradle/newMultiplatformHighlighting/first/build.gradle
+++ b/idea/testData/gradle/newMultiplatformHighlighting/first/build.gradle
@@ -1,9 +1,8 @@
 plugins {
-    id 'kotlin-multiplatform' version '1.3.0'
+    id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}'
 }
 repositories {
-    mavenCentral()
-    jcenter()
+    {{kotlin_plugin_repositories}}
 }
 kotlin {
     targets {
diff --git a/idea/testData/gradle/newMultiplatformHighlighting/first/settings.gradle b/idea/testData/gradle/newMultiplatformHighlighting/first/settings.gradle
index 22d979e37ee..9ee4783d731 100644
--- a/idea/testData/gradle/newMultiplatformHighlighting/first/settings.gradle
+++ b/idea/testData/gradle/newMultiplatformHighlighting/first/settings.gradle
@@ -1,18 +1,6 @@
 pluginManagement {
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id == "kotlin-multiplatform") {
-                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
-            }
-        }
-    }
-
     repositories {
-        mavenCentral()
-
-        maven { url 'https://plugins.gradle.org/m2/' }
-
-        jcenter()
+        {{kotlin_plugin_repositories}}
     }
 }
 rootProject.name = 'first'
\ No newline at end of file
diff --git a/idea/testData/gradle/newMultiplatformHighlighting/noErrors/build.gradle b/idea/testData/gradle/newMultiplatformHighlighting/noErrors/build.gradle
index 9a8c2b2872a..6ca42a4c421 100644
--- a/idea/testData/gradle/newMultiplatformHighlighting/noErrors/build.gradle
+++ b/idea/testData/gradle/newMultiplatformHighlighting/noErrors/build.gradle
@@ -1,11 +1,9 @@
 // NO_ERRORS_EXPECTED
-
 plugins {
-    id 'kotlin-multiplatform' version '1.3.0'
+    id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}'
 }
 repositories {
-    mavenCentral()
-    jcenter()
+    {{kotlin_plugin_repositories}}
 }
 kotlin {
     targets {
diff --git a/idea/testData/gradle/newMultiplatformHighlighting/noErrors/settings.gradle b/idea/testData/gradle/newMultiplatformHighlighting/noErrors/settings.gradle
index 22d979e37ee..9ee4783d731 100644
--- a/idea/testData/gradle/newMultiplatformHighlighting/noErrors/settings.gradle
+++ b/idea/testData/gradle/newMultiplatformHighlighting/noErrors/settings.gradle
@@ -1,18 +1,6 @@
 pluginManagement {
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id == "kotlin-multiplatform") {
-                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
-            }
-        }
-    }
-
     repositories {
-        mavenCentral()
-
-        maven { url 'https://plugins.gradle.org/m2/' }
-
-        jcenter()
+        {{kotlin_plugin_repositories}}
     }
 }
 rootProject.name = 'first'
\ No newline at end of file