diff --git a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt
index af78f69930e..47bd69a9f20 100644
--- a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt
+++ b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt
@@ -17,7 +17,7 @@
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
-import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment
+import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import com.intellij.openapi.util.Disposer
 import org.jetbrains.kotlin.config.CompilerConfiguration
@@ -122,14 +122,14 @@ class NoInternalVisibilityInStdLibTest {
             configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, "../src/generated")
             configuration.addAll(JVMConfigurationKeys.CLASSPATH_KEY, PathUtil.getJdkClassesRoots())
 
-            val environment = JetCoreEnvironment.createForProduction(disposable!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
+            val environment = KotlinCoreEnvironment.createForProduction(disposable!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
 
             val module = TopDownAnalyzerFacadeForJVM.createJavaModule("<module for validating std lib>")
             module.addDependencyOnModule(module)
             module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule())
 
             TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegrationWithCustomContext(
-                    environment.getProject(),
+                    environment.project,
                     GlobalContext(),
                     environment.getSourceFiles(),
                     CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(),
@@ -143,8 +143,8 @@ class NoInternalVisibilityInStdLibTest {
     Test fun testJsStdlibJar() {
         doTest(ANALYZE_PACKAGE_ROOTS_FOR_JS, ADDITIONALLY_REQUIRED_PACKAGES_FOR_JS) {
             val configuration = CompilerConfiguration()
-            val environment = JetCoreEnvironment.createForProduction(disposable!!, configuration, EnvironmentConfigFiles.JS_CONFIG_FILES)
-            val project = environment.getProject()
+            val environment = KotlinCoreEnvironment.createForProduction(disposable!!, configuration, EnvironmentConfigFiles.JS_CONFIG_FILES)
+            val project = environment.project
             val pathToJsStdlibJar = KOTLIN_ROOT_PATH + PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath().path
             val config = LibrarySourcesConfig(project, "testModule", listOf(pathToJsStdlibJar), EcmaVersion.defaultVersion(), false, false)
 
diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt
index 830f3d0b0df..0184d07fda9 100644
--- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt
+++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt
@@ -1,7 +1,7 @@
 package test.kotlin
 
 import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys
-import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment
+import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import com.intellij.openapi.Disposable
@@ -26,7 +26,7 @@ class PsiUtilsTest {
         }
     }
 
-    private var environment: JetCoreEnvironment? = null
+    private var environment: KotlinCoreEnvironment? = null
 
     [Before]
     fun before() {
@@ -34,7 +34,7 @@ class PsiUtilsTest {
 
         val configuration = CompilerConfiguration()
         configuration.addAll(JVMConfigurationKeys.CLASSPATH_KEY, PathUtil.getJdkClassesRoots())
-        environment = JetCoreEnvironment.createForTests(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
+        environment = KotlinCoreEnvironment.createForTests(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
     }
 
     [After]
@@ -45,7 +45,7 @@ class PsiUtilsTest {
     private fun createFile(content: String): JetFile {
         val virtualFile = LightVirtualFile("file.kt", JetLanguage.INSTANCE, content);
         virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
-        return (PsiFileFactory.getInstance(environment!!.getProject()) as PsiFileFactoryImpl)
+        return (PsiFileFactory.getInstance(environment!!.project) as PsiFileFactoryImpl)
                 .trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false) as JetFile
     }