diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.kt
index 918e52cde47..3678a205fdc 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.kt
@@ -53,6 +53,7 @@ abstract class ConfigureKotlinInProjectAction : AnAction() {
     }
 }
 
+
 class ConfigureKotlinJsInProjectAction: ConfigureKotlinInProjectAction() {
     override fun getApplicableConfigurators(project: Project) = getAbleToRunConfigurators(project).filter {
         it.targetPlatform == JsPlatform
diff --git a/libraries/tools/kotlin-allopen/plugin-marker/build.gradle b/libraries/tools/kotlin-allopen/plugin-marker/build.gradle
index 64c6fe30717..55ed654d5ca 100644
--- a/libraries/tools/kotlin-allopen/plugin-marker/build.gradle
+++ b/libraries/tools/kotlin-allopen/plugin-marker/build.gradle
@@ -1,3 +1,3 @@
-apply from: "$rootDir/pluginMarkers.gradle"
+apply from: "$rootDir/libraries/tools/gradle-tools/pluginMarkers.gradle"
 
 pluginMarkerProject('kotlin-allopen')
diff --git a/libraries/tools/kotlin-gradle-plugin/plugin-marker/build.gradle b/libraries/tools/kotlin-gradle-plugin/plugin-marker/build.gradle
index 7dc556f296b..93c7d15d469 100644
--- a/libraries/tools/kotlin-gradle-plugin/plugin-marker/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/plugin-marker/build.gradle
@@ -1,3 +1,3 @@
-apply from: "$rootDir/pluginMarkers.gradle"
+apply from: "$rootDir/libraries/tools/gradle-tools/pluginMarkers.gradle"
 
 pluginMarkerProject('kotlin-gradle-plugin')
diff --git a/libraries/tools/kotlin-noarg/plugin-marker/build.gradle b/libraries/tools/kotlin-noarg/plugin-marker/build.gradle
index d9ec92aaaf5..fa51a03ea33 100644
--- a/libraries/tools/kotlin-noarg/plugin-marker/build.gradle
+++ b/libraries/tools/kotlin-noarg/plugin-marker/build.gradle
@@ -1,3 +1,3 @@
-apply from: "$rootDir/pluginMarkers.gradle"
+apply from: "$rootDir/libraries/tools/gradle-tools/pluginMarkers.gradle"
 
 pluginMarkerProject('kotlin-noarg')
diff --git a/settings.gradle b/settings.gradle
index 47f93e8ed97..e166e40a3ac 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -126,7 +126,13 @@ include ":kotlin-build-common",
         ":kotlin-annotation-processing-gradle",
         ":examples:kotlin-jsr223-local-example",
         ":examples:kotlin-jsr223-daemon-local-eval-example",
-        ":ultimate"
+        ":ultimate",
+
+        // plugin markers:
+        ':kotlin-gradle-plugin:plugin-marker',
+        ':kotlin-allopen:plugin-marker',
+        ':kotlin-noarg:plugin-marker'
+
 
 rootProject.name = "kotlin"
 
@@ -188,3 +194,8 @@ project(':kotlin-annotation-processing').projectDir = "$rootDir/plugins/kapt3" a
 project(':examples:kotlin-jsr223-local-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-local-example" as File
 project(':examples:kotlin-jsr223-daemon-local-eval-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-daemon-local-eval-example" as File
 
+// plugin markers:
+project(':kotlin-gradle-plugin:plugin-marker').projectDir = file("$rootDir/libraries/tools/kotlin-gradle-plugin/plugin-marker")
+project(':kotlin-allopen:plugin-marker').projectDir = file("$rootDir/libraries/tools/kotlin-allopen/plugin-marker")
+project(':kotlin-noarg:plugin-marker').projectDir = file("$rootDir/libraries/tools/kotlin-noarg/plugin-marker")
+