diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt b/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt
index 3bb81a3502d..e399be6a27e 100644
--- a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt
+++ b/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt
@@ -22,7 +22,7 @@ class KDocCompiler() : KotlinCompiler() {
 
     override fun configureEnvironment(environment : CompileEnvironment?, arguments : CompilerArguments?, errStream : PrintStream?) {
         super.configureEnvironment(environment, arguments, errStream)
-        val coreEnvironment = environment?.getMyEnvironment()
+        val coreEnvironment = environment?.getEnvironment()
         if (coreEnvironment != null) {
             val kdoc = KDoc()
 
diff --git a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt b/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
index a4e9e3ec629..e31df954dd3 100644
--- a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
+++ b/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
@@ -27,7 +27,7 @@ class GenerateSiteTest : TestCase() {
         args.setOutputDir("target/classes-stdlib")
 
         val config = args.docConfig
-        config.docOutputDir = outDir.getPath()!!
+        config.docOutputDir = outDir.getCanonicalPath()!!
         config.title = "Kotlin API ($version)"
         config.version = version
         config.ignorePackages.add("kotlin.support")
@@ -52,7 +52,7 @@ class GenerateSiteTest : TestCase() {
         args.setOutputDir("target/classes-js")
 
         val config = args.docConfig
-        config.docOutputDir = outDir.getPath()!!
+        config.docOutputDir = outDir.getCanonicalPath()!!
         config.title = "Kotlin JS API ($version)"
         config.version = version
         config.ignorePackages.add("java")
@@ -80,7 +80,7 @@ class GenerateSiteTest : TestCase() {
 
     fun findTemplateDir(): File {
         val path = "src/main/templates"
-        for (p in arrayList(".", "apidocs", "library/apidocs")) {
+        for (p in arrayList(".", "website", "library/website")) {
             val sourceDir = File(".", path)
             if (sourceDir.exists()) {
                 return sourceDir