diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java b/compiler/tests-common/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java
index 895270b059d..c6836bb44af 100644
--- a/compiler/tests-common/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java
+++ b/compiler/tests-common/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java
@@ -86,20 +86,15 @@ public abstract class KotlinMultiFileTestWithJava<M, F> extends KtUsefulTestCase
             ContentRootsKt.addKotlinSourceRoot(configuration, kotlinSourceRoot.getPath());
         }
 
-        KotlinCoreEnvironment environment =
-                KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, getEnvironmentConfigFiles());
-        performCustomConfiguration(
-                environment
-        );
-
-        return environment;
+        performCustomConfiguration(configuration);
+        return KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, getEnvironmentConfigFiles());
     }
 
     protected boolean isJavaSourceRootNeeded() {
         return true;
     }
 
-    protected void performCustomConfiguration(@NotNull KotlinCoreEnvironment environment) {
+    protected void performCustomConfiguration(@NotNull CompilerConfiguration configuration) {
 
     }
 
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest.kt b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest.kt
index 8a5bef70263..475529e2a9b 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest.kt
@@ -16,12 +16,12 @@
 
 package org.jetbrains.kotlin.checkers
 
-import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
+import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
 
 abstract class AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest : AbstractForeignAnnotationsNoAnnotationInClasspathTest() {
-    override fun performCustomConfiguration(environment: KotlinCoreEnvironment) {
-        super.performCustomConfiguration(environment)
-        environment.configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true)
+    override fun performCustomConfiguration(configuration: CompilerConfiguration) {
+        super.performCustomConfiguration(configuration)
+        configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true)
     }
 }