diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
index 16c3a2a1a64..4e5bd4e725d 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
@@ -62,6 +62,7 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.stubs.BinaryFileStubBuilders
 import com.intellij.psi.util.JavaClassSupers
 import com.intellij.util.io.URLUtil
+import com.intellij.util.lang.UrlClassLoader
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
@@ -526,7 +527,7 @@ class KotlinCoreEnvironment private constructor(
                     ?: PathUtil.getResourcePathForClass(this::class.java).takeIf { it.hasConfigFile(configFilePath) }
                     // hack for load extensions when compiler run directly from project directory (e.g. in tests)
                     ?: File("compiler/cli/src").takeIf { it.hasConfigFile(configFilePath) }
-                    ?: throw IllegalStateException("Unable to find extension point configuration $configFilePath")
+                    ?: throw IllegalStateException("Unable to find extension point configuration $configFilePath (cp:\n  ${(Thread.currentThread().contextClassLoader as? UrlClassLoader)?.urls?.joinToString("\n  ") { it.file }})")
 
             CoreApplicationEnvironment.registerExtensionPointAndExtensions(pluginRoot, configFilePath, Extensions.getRootArea())
         }
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptWithTemplate/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptWithTemplate/pom.xml
index d56aa36ab41..c381f93988d 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptWithTemplate/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptWithTemplate/pom.xml
@@ -14,6 +14,11 @@
             <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-compiler</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-script-util</artifactId>
diff --git a/plugins/source-sections/source-sections-compiler/build.gradle.kts b/plugins/source-sections/source-sections-compiler/build.gradle.kts
index 9e75e67a3e9..fccd83cc866 100644
--- a/plugins/source-sections/source-sections-compiler/build.gradle.kts
+++ b/plugins/source-sections/source-sections-compiler/build.gradle.kts
@@ -30,7 +30,7 @@ afterEvaluate {
     dependencies {
         compileOnly(intellijCoreJar())
         testCompile(intellijCoreJar())
-        testCompile(intellij { include("idea.jar", "idea_rt.jar", "openapi.jar") })
+        testCompile(intellij { include("idea.jar", "idea_rt.jar", "openapi.jar", "log4j.jar", "jdom.jar", "jps-model.jar") })
     }
 }
 
diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts
index 9b1780217ee..f874a122aa2 100644
--- a/ultimate/build.gradle.kts
+++ b/ultimate/build.gradle.kts
@@ -149,10 +149,7 @@ val preparedResources = File(buildDir, "prepResources")
 
 sourceSets {
     "main" { projectDefault() }
-    "test" {
-        projectDefault()
-        resources.srcDir(preparedResources)
-    }
+    "test" { projectDefault() }
 }
 
 val ultimatePluginXmlContent: String by lazy {
@@ -218,6 +215,7 @@ projectTest {
     dependsOn(preparePluginXml)
     workingDir = rootDir
     doFirst {
+        classpath.add(files(preparedResources))
         systemProperty("spring.classpath", springClasspath.asPath)
     }
 }