diff --git a/compiler/tests/org/jetbrains/jet/KotlinTestWithEnvironmentManagement.java b/compiler/tests/org/jetbrains/jet/KotlinTestWithEnvironmentManagement.java
index 44049f80df0..b96ac4e380a 100644
--- a/compiler/tests/org/jetbrains/jet/KotlinTestWithEnvironmentManagement.java
+++ b/compiler/tests/org/jetbrains/jet/KotlinTestWithEnvironmentManagement.java
@@ -43,7 +43,13 @@ public abstract class KotlinTestWithEnvironmentManagement extends TestCase {
         public final Project project;
 
         public JetCoreEnvironmentWithDisposable(@NotNull ConfigurationKind configurationKind) {
-            this.jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(rootDisposable, configurationKind);
+            this(configurationKind, true);
+        }
+
+        public JetCoreEnvironmentWithDisposable(@NotNull ConfigurationKind configurationKind, boolean mockJdk) {
+            this.jetCoreEnvironment = new JetCoreEnvironment(rootDisposable,
+                            CompileCompilerDependenciesTest.compilerConfigurationForTests(configurationKind, mockJdk)
+                    );
             this.project = jetCoreEnvironment.getProject();
         }