diff --git a/build.gradle.kts b/build.gradle.kts
index 4688536752c..e1bc5f3eb00 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,6 @@ buildscript {
     val repos = listOfNotNull(
             bootstrapKotlinRepo,
             "https://jcenter.bintray.com/",
-            "https://plugins.gradle.org/m2")
             "https://plugins.gradle.org/m2",
             "http://dl.bintray.com/kotlin/kotlinx",
             "https://repo.gradle.org/gradle/libs-releases-local", // for native-platform
diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
index 01c13e6b04a..afaa691d7eb 100644
--- a/buildSrc/src/main/kotlin/dependencies.kt
+++ b/buildSrc/src/main/kotlin/dependencies.kt
@@ -2,12 +2,9 @@
 
 import org.gradle.api.GradleException
 import org.gradle.api.Project
-import org.gradle.api.Task
-import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.kotlin.dsl.DependencyHandlerScope
 import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.project
 import java.io.File
@@ -23,8 +20,10 @@ fun Project.commonDep(coord: String): String {
     }
 }
 
-fun Project.commonDep(group: String, artifact: String, vararg suffixesAndClassifiers: String): String =
-        "$group:$artifact${suffixesAndClassifiers.filterNot { it.startsWith(':') }.joinToString("")}:${commonVer(group, artifact)}${suffixesAndClassifiers.filter { it.startsWith(':') }.joinToString("")}"
+fun Project.commonDep(group: String, artifact: String, vararg suffixesAndClassifiers: String): String {
+    val (classifiers, artifactSuffixes) = suffixesAndClassifiers.partition { it.startsWith(':') }
+    return "$group:$artifact${artifactSuffixes.joinToString("")}:${commonVer(group, artifact)}${classifiers.joinToString("")}"
+}
 
 fun Project.commonVer(group: String, artifact: String) =
         when {
diff --git a/compiler/frontend/buildLexer.xml b/compiler/frontend/buildLexer.xml
index 355bb20cad5..5c9c51f5427 100644
--- a/compiler/frontend/buildLexer.xml
+++ b/compiler/frontend/buildLexer.xml
@@ -34,7 +34,7 @@
     </macrodef>
 
     <target name="check-idea-flex.skeleton.exists">
-        <available file="${builddir}/idea-flex.skeleton" property="skjeleton.exisits"/>
+        <available file="${builddir}/idea-flex.skeleton" property="skeleton.exists"/>
     </target>
 
     <target name="get-idea-flex.skeleton.if.not.exists" depends="check-idea-flex.skeleton.exists" unless="skjeleton.exisits">
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
index 1bd98e9348a..71831d5136b 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
@@ -79,7 +79,7 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir {
         content = normalizePath(content, testDataDir, "[TestData]");
         content = normalizePath(content, tmpdir, "[Temp]");
         content = normalizePath(content, getCompilerLib(), "[CompilerLib]");
-        content = normalizePath(content, getKotlinProjectHome(), "[KotlinProjectHome]");
+        content = normalizePath(content, new File(KotlinTestUtils.getHomeDirectory()), "[KotlinProjectHome]");
         content = content.replaceAll(Pattern.quote(KotlinCompilerVersion.VERSION), "[KotlinVersion]");
         content = content.replaceAll("\\(JRE .+\\)", "(JRE [JREVersion])");
         content = StringUtil.convertLineSeparators(content);
@@ -139,11 +139,6 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir {
         return file;
     }
 
-    protected static File getKotlinProjectHome() {
-        // assuming that tests are always run from the project's root
-        return new File(System.getProperty("user.dir"));
-    }
-
     private static class OutputListener extends ProcessAdapter {
         private final StringBuilder out;
         private final StringBuilder err;
diff --git a/custom-dependencies/protobuf-relocated/build.gradle.kts b/custom-dependencies/protobuf-relocated/build.gradle.kts
index 14d4a381152..760d306ed9e 100644
--- a/custom-dependencies/protobuf-relocated/build.gradle.kts
+++ b/custom-dependencies/protobuf-relocated/build.gradle.kts
@@ -37,7 +37,6 @@ val prepare by task<ShadowJar> {
     from(baseProtobuf.files.find { it.name.startsWith("protobuf-java") }?.canonicalPath)
 
     relocate("com.google.protobuf", "org.jetbrains.kotlin.protobuf" ) {
-        // TODO: remove "it." after #KT-12848 get addressed
         exclude("META-INF/maven/com.google.protobuf/protobuf-java/pom.properties")
     }
     addArtifact("archives", this, this)
diff --git a/idea-runner/build.gradle.kts b/idea-runner/build.gradle.kts
index 8edf13e342b..0a5c08a6095 100644
--- a/idea-runner/build.gradle.kts
+++ b/idea-runner/build.gradle.kts
@@ -41,7 +41,6 @@ afterEvaluate {
     }
 
     task<RunIdeTask>("runIde") {
-        dependsOn(":dist", ":prepare:idea-plugin:idea-plugin", ":ideaPlugin")
         dependsOn(prepareSandbox)
         group = "intellij"
         description = "Runs Intellij IDEA with installed plugin."
@@ -59,7 +58,8 @@ afterEvaluate {
                 "-Dapple.laf.useScreenMenuBar=true",
                 "-Dapple.awt.graphics.UseQuartz=true",
                 "-Dsun.io.useCanonCaches=false",
-                "-Dkotlin.internal.mode.enabled=true"
+                "-Dkotlin.internal.mode.enabled=true",
+                "-Didea.ProcessCanceledException=disabled"
         )
     }
 }
diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
index 8610f08bace..c5cca0e0dc3 100644
--- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
@@ -44,13 +44,10 @@ dependencies {
     testRuntime(intellijDep())
     testRuntime(intellijPluginDep("junit"))
     testRuntime(intellijPluginDep("IntelliLang"))
-    testRuntime(intellijPluginDep("testng"))
-    testRuntime(intellijPluginDep("copyright"))
     testRuntime(intellijPluginDep("properties"))
     testRuntime(intellijPluginDep("java-i18n"))
     testRuntime(intellijPluginDep("gradle"))
     testRuntime(intellijPluginDep("Groovy"))
-    testRuntime(intellijPluginDep("coverage"))
     testRuntime(intellijPluginDep("java-decompiler"))
     testRuntime(intellijPluginDep("maven"))
     testRuntime(intellijPluginDep("android"))