diff --git a/compiler/tests/org/jetbrains/jet/JetLiteFixture.java b/compiler/tests/org/jetbrains/jet/JetLiteFixture.java
index 70db5fdf602353e61031bfd0b3a9039ba9b3201b..823879f68482a50afc5bc4536445c70facb42a94 100644
--- a/compiler/tests/org/jetbrains/jet/JetLiteFixture.java
+++ b/compiler/tests/org/jetbrains/jet/JetLiteFixture.java
@@ -69,18 +69,18 @@ public abstract class JetLiteFixture extends UsefulTestCase {
         super.setUp();
     }
 
-    protected void createEnvironmentWithMockJdk() {
+    protected void createEnvironmentWithMockJdkAndIdeaAnnotations() {
         if (myEnvironment != null) {
             throw new IllegalStateException("must not set up myEnvironemnt twice");
         }
-        myEnvironment = JetTestUtils.createEnvironmentWithMockJdk(getTestRootDisposable());
+        myEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable());
     }
 
-    protected void createEnvironmentWithMockJdk(@NotNull CompilerSpecialMode compilerSpecialMode) {
+    protected void createEnvironmentWithMockJdkAndIdeaAnnotations(@NotNull CompilerSpecialMode compilerSpecialMode) {
         if (myEnvironment != null) {
             throw new IllegalStateException("must not set up myEnvironemnt twice");
         }
-        myEnvironment = JetTestUtils.createEnvironmentWithMockJdk(getTestRootDisposable(), compilerSpecialMode);
+        myEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable(), compilerSpecialMode);
     }
 
     protected void createEnvironmentWithFullJdk() {
diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
index 2e3c6076d8e80ba85b574c18ce080e4829982c18..2a89186fc65986b3b2eff99dc0ae23ce749e5a4a 100644
--- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java
+++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
@@ -166,11 +166,11 @@ public class JetTestUtils {
                 CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, true));
     }
 
-    public static JetCoreEnvironment createEnvironmentWithMockJdk(Disposable disposable) {
-        return createEnvironmentWithMockJdk(disposable, CompilerSpecialMode.REGULAR);
+    public static JetCoreEnvironment createEnvironmentWithMockJdkAndIdeaAnnotations(Disposable disposable) {
+        return createEnvironmentWithMockJdkAndIdeaAnnotations(disposable, CompilerSpecialMode.REGULAR);
     }
 
-    public static JetCoreEnvironment createEnvironmentWithMockJdk(Disposable disposable, @NotNull CompilerSpecialMode compilerSpecialMode) {
+    public static JetCoreEnvironment createEnvironmentWithMockJdkAndIdeaAnnotations(Disposable disposable, @NotNull CompilerSpecialMode compilerSpecialMode) {
         JetCoreEnvironment environment =
                 new JetCoreEnvironment(disposable, CompileCompilerDependenciesTest.compilerDependenciesForTests(compilerSpecialMode, true));
         environment.addToClasspath(getAnnotationsJar());
diff --git a/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java
index 32e7c4aed69262185923e9210a3ed02dd43b01d3..1b1c6a00665473cf55af9a916c181aa7b0a5c9e1 100644
--- a/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java
+++ b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java
@@ -55,7 +55,7 @@ public class JetControlFlowTest extends JetLiteFixture {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.STDLIB);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.STDLIB);
     }
 
     @Override
diff --git a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java
index 3aeae16c31a1bf19130c25ecd7ce72e86a3f430b..1a19a747b47f95993dd5ab2f98fa40d63de49db1 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java
@@ -43,7 +43,7 @@ public class CheckerTestUtilTest extends JetLiteFixture {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk();
+        createEnvironmentWithMockJdkAndIdeaAnnotations();
     }
 
 
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
index 603b8fc3b7cd8ec385722b6027978987e4145c87..510a41d63038034755f3de2fee6b5b3089a16d57 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
@@ -27,7 +27,6 @@ import com.intellij.psi.PsiFileFactory;
 import junit.framework.Test;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.CompileCompilerDependenciesTest;
 import org.jetbrains.jet.JetLiteFixture;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
@@ -57,7 +56,7 @@ public class JetDiagnosticsTest extends JetLiteFixture {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.STDLIB);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.STDLIB);
     }
 
     @Override
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileJavaAgainstKotlinTest.java
index 6f995fb3ff5efd913b99029675327dbbde48d41a..0027519b4513284bc0a1f7efd86ce636a2cca320 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileJavaAgainstKotlinTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileJavaAgainstKotlinTest.java
@@ -67,7 +67,7 @@ public class CompileJavaAgainstKotlinTest extends TestCaseWithTmpdir {
 
     @Override
     protected void runTest() throws Throwable {
-        jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(myTestRootDisposable);
+        jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable);
 
 
         String text = FileUtil.loadFile(ktFile);
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileKotlinAgainstKotlinTest.java
index d4fca06a78fa9ba1e9cbf8830e3f319fe1eadeb2..4ac8fd4ad9c161b555db6b911106783059781e71 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileKotlinAgainstKotlinTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileKotlinAgainstKotlinTest.java
@@ -82,7 +82,7 @@ public class CompileKotlinAgainstKotlinTest extends TestCaseWithTmpdir  {
     }
 
     private void compileA() throws IOException {
-        JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(myTestRootDisposable);
+        JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable);
 
         String text = FileUtil.loadFile(ktAFile);
 
@@ -98,7 +98,7 @@ public class CompileKotlinAgainstKotlinTest extends TestCaseWithTmpdir  {
     }
 
     private void compileB() throws IOException {
-        JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(myTestRootDisposable);
+        JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable);
 
         jetCoreEnvironment.addToClasspath(aDir);
 
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/JavaDescriptorResolverTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/JavaDescriptorResolverTest.java
index 955d611294d834b12bbb3ce1d0faaff263ffd48f..c25584b1bd71da0d1e54703367a3b02c9934dcba 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/JavaDescriptorResolverTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/JavaDescriptorResolverTest.java
@@ -17,7 +17,6 @@
 package org.jetbrains.jet.cli.jvm.compiler;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.CompileCompilerDependenciesTest;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.di.InjectorForJavaSemanticServices;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -50,7 +49,7 @@ public class JavaDescriptorResolverTest extends TestCaseWithTmpdir {
     private void compileFileResolveDescriptor(@NotNull String fileRelativePath, @NotNull FqName fqName) throws IOException {
         compileJavaFile(new File("compiler/testData/javaDescriptorResolver/" + fileRelativePath), tmpdir);
 
-        JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(myTestRootDisposable, CompilerSpecialMode.JDK_HEADERS);
+        JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, CompilerSpecialMode.JDK_HEADERS);
         jetCoreEnvironment.addToClasspath(tmpdir);
 
         InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadJavaBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadJavaBinaryClassTest.java
index d2d38b6a16ab47cb511fb92bbfce96fbf947c206..4b67e197ad538da68cc31fc3ef5fd17bddd83a3e 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadJavaBinaryClassTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadJavaBinaryClassTest.java
@@ -23,7 +23,6 @@ import com.intellij.psi.impl.PsiFileFactoryImpl;
 import com.intellij.testFramework.LightVirtualFile;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.CompileCompilerDependenciesTest;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.di.InjectorForJavaSemanticServices;
@@ -78,7 +77,7 @@ public class ReadJavaBinaryClassTest extends TestCaseWithTmpdir {
 
     @NotNull
     private NamespaceDescriptor compileKotlin() throws Exception {
-        JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(myTestRootDisposable, CompilerSpecialMode.JDK_HEADERS);
+        JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, CompilerSpecialMode.JDK_HEADERS);
 
         String text = FileUtil.loadFile(ktFile);
 
@@ -110,7 +109,7 @@ public class ReadJavaBinaryClassTest extends TestCaseWithTmpdir {
             fileManager.close();
         }
 
-        JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(myTestRootDisposable, CompilerSpecialMode.JDK_HEADERS);
+        JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, CompilerSpecialMode.JDK_HEADERS);
 
         jetCoreEnvironment.addToClasspath(tmpdir);
         jetCoreEnvironment.addToClasspath(new File("out/production/runtime"));
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadKotlinBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadKotlinBinaryClassTest.java
index 67e73da8f734a9cac176b4cbe5f940795b90e550..10998b321a4a1787ad3028c0b65860f978529617 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadKotlinBinaryClassTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadKotlinBinaryClassTest.java
@@ -25,7 +25,6 @@ import com.intellij.testFramework.LightVirtualFile;
 import junit.framework.Assert;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.CompileCompilerDependenciesTest;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.codegen.ClassFileFactory;
@@ -63,7 +62,7 @@ public class ReadKotlinBinaryClassTest extends TestCaseWithTmpdir {
 
     @Override
     public void runTest() throws Exception {
-        jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(myTestRootDisposable, CompilerSpecialMode.JDK_HEADERS);
+        jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, CompilerSpecialMode.JDK_HEADERS);
 
         String text = FileUtil.loadFile(testFile);
 
@@ -84,7 +83,7 @@ public class ReadKotlinBinaryClassTest extends TestCaseWithTmpdir {
         Disposer.dispose(myTestRootDisposable);
 
 
-        jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(myTestRootDisposable, CompilerSpecialMode.JDK_HEADERS);
+        jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, CompilerSpecialMode.JDK_HEADERS);
 
         jetCoreEnvironment.addToClasspath(tmpdir);
         jetCoreEnvironment.addToClasspath(new File("out/production/runtime"));
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/WriteSignatureTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/WriteSignatureTest.java
index 9ffdf0eb2c103409bafc2b6429baf3a3285d1396..870c3db2e3698c0e4048e6ccf287d133cb0f3bfe 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/WriteSignatureTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/WriteSignatureTest.java
@@ -72,7 +72,7 @@ public class WriteSignatureTest extends TestCaseWithTmpdir {
 
     @Override
     protected void runTest() throws Throwable {
-        jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(myTestRootDisposable);
+        jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable);
 
 
         String text = FileUtil.loadFile(ktFile);
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java
index a300491e0f6ac9487534d4952536729086eeca2d..81603c5ac853ca354c397f1f18e0bc39bed0e93c 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java
@@ -119,7 +119,7 @@ public class ResolveDescriptorsFromExternalLibraries {
 
         JetCoreEnvironment jetCoreEnvironment;
         if (jar != null) {
-            jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdk(junk, CompilerSpecialMode.STDLIB);
+            jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(junk, CompilerSpecialMode.STDLIB);
             jetCoreEnvironment.addToClasspath(jar);
         }
         else {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/AnnotationGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/AnnotationGenTest.java
index ae2a56948552e7d8287c7b9fa447943b4986cb82..a0dd3390643f233d8cd2a16d266a08a106d6638d 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/AnnotationGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/AnnotationGenTest.java
@@ -29,7 +29,7 @@ public class AnnotationGenTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
     }
 
     public void testPropField() throws NoSuchFieldException, NoSuchMethodException {
@@ -164,4 +164,4 @@ public class AnnotationGenTest extends CodegenTestCase {
         assertEquals("C", cClass.getName());
         assertEquals("239", cClass.getDeclaredMethod("c").invoke(invoke));
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java
index b51c3b2bfff58eddd8fd62d6b3da5e4901dfd339..8193d92ebc5015750ae036ab3c4ac60fce430747 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java
@@ -25,7 +25,7 @@ public class ArrayGenTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
     }
 
     public void testKt238 () throws Exception {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java
index c389165b403db0a75da60f268e2696591515be6e..d94b30d473c516fcceb3057dd6bc0cc7f1916286 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java
@@ -20,7 +20,7 @@ import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
 
 public class BridgeMethodGenTest extends CodegenTestCase {
     public void testBridgeMethod () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("bridge.jet");
     }
 }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
index ac3e9db8d37a38b0452b35f83f5223b064c8fe1a..89dd8c7c6b8254b240c92b137bf13825d09118b9 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
@@ -35,7 +35,7 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testPSVMClass() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile("classes/simpleClass.jet");
 
         final Class aClass = loadClass("SimpleClass", generateClassesInFile());
@@ -46,7 +46,7 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testArrayListInheritance() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile("classes/inheritingFromArrayList.jet");
 //        System.out.println(generateToText());
         final Class aClass = loadClass("Foo", generateClassesInFile());
@@ -54,37 +54,37 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testInheritanceAndDelegation_DelegatingDefaultConstructorProperties() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/inheritance.jet");
     }
 
     public void testInheritanceAndDelegation2() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/delegation2.kt");
     }
 
     public void testFunDelegation() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/funDelegation.jet");
     }
 
     public void testPropertyDelegation() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/propertyDelegation.jet");
     }
 
     public void testDiamondInheritance() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/diamondInheritance.jet");
     }
 
     public void testRightHandOverride() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/rightHandOverride.jet");
     }
 
     public void testNewInstanceExplicitConstructor() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile("classes/newInstanceDefaultConstructor.jet");
 //        System.out.println(generateToText());
         final Method method = generateFunction("test");
@@ -93,22 +93,22 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testInnerClass() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/innerClass.jet");
     }
 
     public void testInheritedInnerClass() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/inheritedInnerClass.jet");
     }
 
     public void testInitializerBlock() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/initializerBlock.jet");
     }
 
     public void testAbstractMethod() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("abstract class Foo { abstract fun x(): String; fun y(): Int = 0 }");
 
         final ClassFileFactory codegens = generateClassesInFile();
@@ -118,42 +118,42 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testInheritedMethod() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/inheritedMethod.jet");
     }
 
     public void testInitializerBlockDImpl() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/initializerBlockDImpl.jet");
     }
 
     public void testPropertyInInitializer() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/propertyInInitializer.jet");
     }
 
     public void testOuterThis() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/outerThis.jet");
     }
 
     public void testSecondaryConstructors() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/secondaryConstructors.jet");
     }
 
     public void testExceptionConstructor() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/exceptionConstructor.jet");
     }
 
     public void testSimpleBox() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/simpleBox.jet");
     }
 
     public void testAbstractClass() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("abstract class SimpleClass() { }");
 
         final Class aClass = createClassLoader(generateClassesInFile()).loadClass("SimpleClass");
@@ -161,18 +161,18 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testClassObject() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/classObject.jet");
     }
 
     public void testClassObjectMethod() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         // todo to be implemented after removal of type info
 //        blackBoxFile("classes/classObjectMethod.jet");
     }
 
     public void testClassObjectInterface() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile("classes/classObjectInterface.jet");
         final Method method = generateFunction();
         Object result = method.invoke(null);
@@ -180,32 +180,32 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testOverloadBinaryOperator() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/overloadBinaryOperator.jet");
     }
 
     public void testOverloadUnaryOperator() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/overloadUnaryOperator.jet");
     }
 
     public void testOverloadPlusAssign() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/overloadPlusAssign.jet");
     }
 
     public void testOverloadPlusAssignReturn() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/overloadPlusAssignReturn.jet");
     }
 
     public void testOverloadPlusToPlusAssign() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/overloadPlusToPlusAssign.jet");
     }
 
     public void testEnumClass() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("enum class Direction { NORTH; SOUTH; EAST; WEST }");
         final Class direction = createClassLoader(generateClassesInFile()).loadClass("Direction");
 //        System.out.println(generateToText());
@@ -215,7 +215,7 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testEnumConstantConstructors() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("enum class Color(val rgb: Int) { RED: Color(0xFF0000); GREEN: Color(0x00FF00); }");
         final Class colorClass = createClassLoader(generateClassesInFile()).loadClass("Color");
         final Field redField = colorClass.getField("RED");
@@ -225,25 +225,25 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testClassObjFields() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("class A() { class object { val value = 10 } }\n" +
                  "fun box() = if(A.value == 10) \"OK\" else \"fail\"");
         blackBox();
     }
 
     public void testKt249() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt249.jet");
     }
 
     public void testKt48 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt48.jet");
 //        System.out.println(generateToText());
     }
 
     public void testKt309 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("fun box() = null");
         final Method method = generateFunction("box");
         assertEquals(method.getReturnType().getName(), "java.lang.Object");
@@ -251,73 +251,73 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testKt343 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt343.jet");
 //        System.out.println(generateToText());
     }
 
     public void testKt508 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile("regressions/kt508.jet");
 //        System.out.println(generateToText());
         blackBox();
     }
 
     public void testKt504 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile("regressions/kt504.jet");
 //        System.out.println(generateToText());
         blackBox();
     }
 
     public void testKt501 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt501.jet");
     }
 
     public void testKt496 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt496.jet");
 //        System.out.println(generateToText());
     }
 
     public void testKt500 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt500.jet");
     }
 
     public void testKt694 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         //        blackBoxFile("regressions/kt694.jet");
     }
 
     public void testKt285 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         //        blackBoxFile("regressions/kt285.jet");
     }
 
     public void testKt707 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt707.jet");
     }
 
     public void testKt857 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         //        blackBoxFile("regressions/kt857.jet");
     }
 
     public void testKt903 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt903.jet");
     }
 
     public void testKt940 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt940.kt");
     }
 
     public void testKt1018 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt1018.kt");
     }
 
@@ -332,58 +332,58 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testKt1134() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt1134.kt");
     }
 
     public void testKt1157() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt1157.kt");
     }
 
     public void testKt471() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt471.kt");
     }
 
     public void testKt1213() throws Exception {
-        createEnvironmentWithMockJdk();
+        createEnvironmentWithMockJdkAndIdeaAnnotations();
         //        blackBoxFile("regressions/kt1213.kt");
     }
 
     public void testKt723() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt723.kt");
     }
 
     public void testKt725() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt725.kt");
     }
 
     public void testKt633() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt633.kt");
     }
 
 
     public void testKt1345() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt1345.kt");
     }
 
     public void testKt1538() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt1538.kt");
     }
 
     public void testKt1759() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt1759.kt");
     }
 
     public void testResolveOrder() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("classes/resolveOrder.jet");
     }
 }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java
index 4b220b4b5c1d30307483c639c8955810c9f2e2b4..f83c43d5fcd2f22618d06a9cb905a86c09e43cd6 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java
@@ -26,7 +26,7 @@ public class ClosuresGenTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
     }
 
     public void testSimplestClosure() throws Exception {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java b/compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java
index 1ea4d434873e5871ef844cad0267b8312142831a..d8edb70f5675f1df6645cb06357d6c4b9eb9e2c0 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
 
 public class CompileTextTest extends CodegenTestCase {
     public void testMe() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-        createEnvironmentWithMockJdk();
+        createEnvironmentWithMockJdkAndIdeaAnnotations();
         String text = "import org.jetbrains.jet.codegen.CompileTextTest; fun x() = CompileTextTest()";
         K2JVMCompileEnvironmentConfiguration configuration = new K2JVMCompileEnvironmentConfiguration(
                 myEnvironment, MessageCollector.PLAIN_TEXT_TO_SYSTEM_ERR);
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java b/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java
index 095cbdf7b490567b785f2eddb6380c230afcb69f..3bf9fadee39e3c42f10194de541afdaaea3f30c3 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java
@@ -33,7 +33,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testIf() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
 
 //        System.out.println(generateToText());
@@ -43,7 +43,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testSingleBranchIf() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
 
 //        System.out.println(generateToText());
@@ -65,7 +65,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     private void factorialTest(final String name) throws IllegalAccessException, InvocationTargetException {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile(name);
 
 //        System.out.println(generateToText());
@@ -75,7 +75,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testContinue() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
 //        System.out.println(generateToText());
         final Method main = generateFunction();
@@ -84,7 +84,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testIfNoElse() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
 //        System.out.println(generateToText());
         final Method main = generateFunction();
@@ -93,7 +93,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testCondJumpOnStack() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("import java.lang.Boolean as jlBoolean; fun foo(a: String): Int = if (jlBoolean.parseBoolean(a)) 5 else 10");
         final Method main = generateFunction();
         assertEquals(5, main.invoke(null, "true"));
@@ -101,7 +101,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testFor() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
 //        System.out.println(generateToText());
         final Method main = generateFunction();
@@ -110,7 +110,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testIfBlock() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
 //        System.out.println(generateToText());
         final Method main = generateFunction();
@@ -121,7 +121,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testForInArray() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
 //        System.out.println(generateToText());
         final Method main = generateFunction();
@@ -130,7 +130,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testForInRange() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("fun foo(sb: StringBuilder) { for(x in 1..4) sb.append(x) }");
         final Method main = generateFunction();
         StringBuilder stringBuilder = new StringBuilder();
@@ -139,7 +139,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testThrowCheckedException() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("fun foo() { throw Exception(); }");
         final Method main = generateFunction();
         boolean caught = false;
@@ -154,7 +154,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testTryCatch() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
 //        System.out.println(generateToText());
         final Method main = generateFunction();
@@ -163,7 +163,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testTryFinally() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
 //        System.out.println(generateToText());
         final Method main = generateFunction();
@@ -183,37 +183,37 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testForUserType() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("controlStructures/forUserType.jet");
     }
 
     public void testForIntArray() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("controlStructures/forIntArray.jet");
     }
 
     public void testForPrimitiveIntArray() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("controlStructures/forPrimitiveIntArray.jet");
     }
 
     public void testForNullableIntArray() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("controlStructures/forNullableIntArray.jet");
     }
 
     public void testForIntRange() {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("controlStructures/forIntRange.jet");
     }
 
     public void testKt237() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt237.jet");
     }
 
     public void testCompareToNull() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("fun foo(a: String?, b: String?): Boolean = a == null && b !== null && null == a && null !== b");
         String text = generateToText();
         assertTrue(!text.contains("java/lang/Object.equals"));
@@ -224,7 +224,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testCompareToNonnullableEq() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("fun foo(a: String?, b: String): Boolean = a == b || b == a");
 //        System.out.println(generateToText());
         final Method main = generateFunction();
@@ -233,7 +233,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testCompareToNonnullableNotEq() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("fun foo(a: String?, b: String): Boolean = a != b");
         String text = generateToText();
 //        System.out.println(text);
@@ -244,18 +244,18 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testKt299() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt299.jet");
     }
 
     public void testKt416() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt416.jet");
 //        System.out.println(generateToText());
     }
 
     public void testKt513() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt513.jet");
     }
 
@@ -265,37 +265,37 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testKt769() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt769.jet");
 //        System.out.println(generateToText());
     }
 
     public void testKt773() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt773.jet");
 //        System.out.println(generateToText());
     }
 
     public void testKt772() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt772.jet");
 //        System.out.println(generateToText());
     }
 
     public void testKt870() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt870.jet");
 //        System.out.println(generateToText());
     }
 
     public void testKt958() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt958.jet");
 //        System.out.println(generateToText());
     }
 
     public void testQuicksort() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("controlStructures/quicksort.jet");
 //        System.out.println(generateToText());
     }
@@ -313,22 +313,22 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testKt1076() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt1076.kt");
     }
 
     public void testKt998() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt998.kt");
     }
 
     public void testKt628() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt628.kt");
     }
 
     public void testKt1441() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt1441.kt");
     }
 }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java b/compiler/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java
index f50618fc621163eca3e6f214f836d8ccc6053fc0..5a87c6f2b4c0189e88a9ce737f9cfd579951fbc1 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java
@@ -31,7 +31,7 @@ public class ExtensionFunctionsTest extends CodegenTestCase {
     }
 
     public void testSimple() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
         final Method foo = generateFunction("foo");
         final Character c = (Character) foo.invoke(null);
@@ -39,7 +39,7 @@ public class ExtensionFunctionsTest extends CodegenTestCase {
     }
 
     public void testWhenFail() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
 //        System.out.println(generateToText());
         Method foo = generateFunction("foo");
@@ -47,18 +47,18 @@ public class ExtensionFunctionsTest extends CodegenTestCase {
     }
 
     public void testVirtual() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("extensionFunctions/virtual.jet");
     }
 
     public void testShared() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("extensionFunctions/shared.kt");
 //        System.out.println(generateToText());
     }
 
     public void testKt475() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt475.jet");
     }
 
@@ -73,11 +73,11 @@ public class ExtensionFunctionsTest extends CodegenTestCase {
     }
 
     public void testKtNested2() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.BUILTINS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.BUILTINS);
         blackBoxFile("extensionFunctions/nested2.kt");
     }
     public void testKt606() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.BUILTINS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.BUILTINS);
         blackBoxFile("regressions/kt606.kt");
     }
 }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java
index 2c8c96c56d18b9d39d511fb3d5135dab9ffd1bb6..be5743cbb3bbf74077601a32d496b9226854eb4f 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java
@@ -28,7 +28,7 @@ public class FunctionGenTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
     }
 
     public void testDefaultArgs() throws Exception {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/JdkHeadersTest.java b/compiler/tests/org/jetbrains/jet/codegen/JdkHeadersTest.java
index f70b569d66a6e0dfe7288e0a3043773ce72539ad..89251ffe28a7fbfacf60048cc7a92aab8f287bd5 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/JdkHeadersTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/JdkHeadersTest.java
@@ -28,7 +28,7 @@ public class JdkHeadersTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.STDLIB);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.STDLIB);
     }
 
     public void testArrayList() {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
index 1e8791a1d5905919aee5bf1f09911afecf5fef76..4b70ebf58e664f466caf96e513dddb3afba5f4be 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
@@ -35,7 +35,7 @@ public class NamespaceGenTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
     }
 
     public void testPSVM() throws Exception {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java
index 2803abd67eb33b1be3137e9509da3ddfa3f2f7e5..52f97ed59421b0f5b196928228245183a9323586 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java
@@ -26,7 +26,7 @@ public class ObjectGenTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
     }
 
     public void testSimpleObject() throws Exception {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java b/compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java
index 318de46aec80ad0e4bb5841cd9287b5b2f56069a..b4cf3a0965168583837d79dd7b58bfd639cfc4af 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java
@@ -29,7 +29,7 @@ public class PatternMatchingTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
     }
 
     @Override
diff --git a/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java b/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java
index 0db6d37fa2eb6a41a15f19bd261307b5e9c4b9a7..87b58b2674b971b472a7ba56dd9e69f98d229777 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java
@@ -29,7 +29,7 @@ public class PrimitiveTypesTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
     }
 
     public void testPlus() throws Exception {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
index c0ddbaffc4a50c9a4dc6263fb644fe6e0b6dc9e1..aaa0499c40e4965bafc91673c21571841978ce33 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
@@ -33,7 +33,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testPrivateVal() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
         final Class aClass = loadImplementationClass(generateClassesInFile(), "PrivateVal");
         final Field[] fields = aClass.getDeclaredFields();
@@ -43,7 +43,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testPrivateVar() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
         final Class aClass = loadImplementationClass(generateClassesInFile(), "PrivateVar");
         final Object instance = aClass.newInstance();
@@ -54,7 +54,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testPublicVar() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("class PublicVar() { public var foo : Int = 0; }");
         final Class aClass = loadImplementationClass(generateClassesInFile(), "PublicVar");
         final Object instance = aClass.newInstance();
@@ -65,7 +65,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testAccessorsInInterface() {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("class AccessorsInInterface() { public var foo : Int = 0; }");
         final Class aClass = loadClass("AccessorsInInterface", generateClassesInFile());
         assertNotNull(findMethodByName(aClass, "getFoo"));
@@ -73,7 +73,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testPrivatePropertyInNamespace() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("private val x = 239");
         final Class nsClass = generateNamespaceClass();
         final Field[] fields = nsClass.getDeclaredFields();
@@ -86,7 +86,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testFieldPropertyAccess() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile("properties/fieldPropertyAccess.jet");
 //        System.out.println(generateToText());
         final Method method = generateFunction();
@@ -95,14 +95,14 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testFieldGetter() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("val now: Long get() = System.currentTimeMillis(); fun foo() = now");
         final Method method = generateFunction("foo");
         assertIsCurrentTime((Long) method.invoke(null));
     }
 
     public void testFieldSetter() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
         final Method method = generateFunction("append");
         method.invoke(null, "IntelliJ ");
@@ -114,7 +114,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testFieldSetterPlusEq() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
         final Method method = generateFunction("append");
         method.invoke(null, "IntelliJ ");
@@ -123,7 +123,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testAccessorsWithoutBody() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("class AccessorsWithoutBody() { protected var foo: Int = 349\n get\n  private set\n fun setter() { foo = 610; } } ");
 //        System.out.println(generateToText());
         final Class aClass = loadImplementationClass(generateClassesInFile(), "AccessorsWithoutBody");
@@ -141,7 +141,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testInitializersForNamespaceProperties() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("val x = System.currentTimeMillis()");
         final Method method = generateFunction("getX");
         method.setAccessible(true);
@@ -149,7 +149,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testPropertyReceiverOnStack() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadFile();
         final Class aClass = loadImplementationClass(generateClassesInFile(), "Evaluator");
         final Constructor constructor = aClass.getConstructor(StringBuilder.class);
@@ -161,7 +161,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testAbstractVal() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("abstract class Foo { public abstract val x: String }");
         final ClassFileFactory codegens = generateClassesInFile();
         final Class aClass = loadClass("Foo", codegens);
@@ -169,7 +169,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testVolatileProperty() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("abstract class Foo { public volatile var x: String = \"\"; }");
 //        System.out.println(generateToText());
         final ClassFileFactory codegens = generateClassesInFile();
@@ -179,18 +179,18 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testKt257 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt257.jet");
 //        System.out.println(generateToText());
     }
 
     public void testKt613 () throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt613.jet");
     }
 
     public void testKt160() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("internal val s = java.lang.Double.toString(1.0)");
         final Method method = generateFunction("getS");
         method.setAccessible(true);
@@ -198,12 +198,12 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testKt1165() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt1165.kt");
     }
 
     public void testKt1168() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt1168.kt");
     }
 
@@ -213,17 +213,17 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testKt1159() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt1159.kt");
     }
 
     public void testKt1417() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt1417.kt");
     }
 
     public void testKt1398() throws Exception {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt1398.kt");
     }
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java b/compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java
index fc1a4ccb5df17484f00badd2b52963b7e31947b8..82f1eaf5fa48edcc3b412d125dfc1e21884cd727 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java
@@ -22,7 +22,7 @@ public class SafeRefTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
     }
 
     public void test247 () throws Exception {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/StringsTest.java b/compiler/tests/org/jetbrains/jet/codegen/StringsTest.java
index 50196c364e7ea4bfa69b0258e87f67fa5ed35ac5..1858eacb7c775587fae8b75d5b7c3c01222d4f70 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/StringsTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/StringsTest.java
@@ -30,7 +30,7 @@ public class StringsTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
     }
 
     public void testAnyToString () throws InvocationTargetException, IllegalAccessException {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/SuperGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/SuperGenTest.java
index 1884873b80a79abdc1580dfc5065b5b86b3cfb49..46c469d61ad4b5d4893c90ad9a86020684475bdf 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/SuperGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/SuperGenTest.java
@@ -23,7 +23,7 @@ public class SuperGenTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
     }
 
     public void testBasicProperty () {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java b/compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java
index 0fe37963fdc0046a0aad3ea69b591102b856f213..f690a0791d5f5dbd132ce83f934f04229dea34f9 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java
@@ -23,7 +23,7 @@ public class TraitsTest  extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
     }
 
     @Override
diff --git a/compiler/tests/org/jetbrains/jet/codegen/TupleGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/TupleGenTest.java
index b394def5fc62753b58ae1ef16d5a4041dfff5505..7cda157836e6b3e7f2b87d3b3b7976fa8fb27a40 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/TupleGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/TupleGenTest.java
@@ -20,7 +20,7 @@ import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
 
 public class TupleGenTest extends CodegenTestCase {
     public void testBasic() {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("/tuples/basic.jet");
 //        System.out.println(generateToText());
     }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java b/compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java
index e7dfe162c4ac3147d03e5e1e02cd47ac484554f1..f212dc4765dd6002afd723f463c30f742a24d2d1 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java
@@ -16,7 +16,6 @@
 
 package org.jetbrains.jet.codegen;
 
-import jet.TypeCastException;
 import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
 
 import java.lang.reflect.Method;
@@ -30,7 +29,7 @@ public class TypeInfoTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
     }
 
     @Override
diff --git a/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java b/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java
index 37e4b680da1cd2f0febaa0cc19ff4b9fd82d0895..5be1db68f10f7181b3c3bc4683b85018866c8899 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java
@@ -27,7 +27,7 @@ import java.lang.reflect.Method;
  */
 public class VarArgTest extends CodegenTestCase {
     public void testStringArray () throws InvocationTargetException, IllegalAccessException {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("fun test(vararg ts: String) = ts");
 //        System.out.println(generateToText());
         final Method main = generateFunction();
@@ -36,7 +36,7 @@ public class VarArgTest extends CodegenTestCase {
     }
 
     public void testIntArray () throws InvocationTargetException, IllegalAccessException {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("fun test(vararg ts: Int) = ts");
 //        System.out.println(generateToText());
         final Method main = generateFunction();
@@ -45,7 +45,7 @@ public class VarArgTest extends CodegenTestCase {
     }
 
     public void testIntArrayKotlinNoArgs () throws InvocationTargetException, IllegalAccessException {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("fun test() = testf(); fun testf(vararg ts: Int) = ts");
 //        System.out.println(generateToText());
         final Method main = generateFunction("test");
@@ -54,7 +54,7 @@ public class VarArgTest extends CodegenTestCase {
     }
 
     public void testIntArrayKotlin () throws InvocationTargetException, IllegalAccessException {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("fun test() = testf(239, 7); fun testf(vararg ts: Int) = ts");
 //        System.out.println(generateToText());
         final Method main = generateFunction("test");
@@ -65,7 +65,7 @@ public class VarArgTest extends CodegenTestCase {
     }
 
     public void testNullableIntArrayKotlin () throws InvocationTargetException, IllegalAccessException {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("fun test() = testf(239.toByte(), 7.toByte()); fun testf(vararg ts: Byte?) = ts");
 //        System.out.println(generateToText());
         final Method main = generateFunction("test");
@@ -76,7 +76,7 @@ public class VarArgTest extends CodegenTestCase {
     }
 
     public void testIntArrayKotlinObj () throws InvocationTargetException, IllegalAccessException {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("fun test() = testf(\"239\"); fun testf(vararg ts: String) = ts");
 //        System.out.println(generateToText());
         final Method main = generateFunction("test");
@@ -86,7 +86,7 @@ public class VarArgTest extends CodegenTestCase {
     }
 
     public void testArrayT () throws InvocationTargetException, IllegalAccessException {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("fun test() = _array(2, 4); fun <T> _array(vararg elements : T) = elements");
 //        System.out.println(generateToText());
         final Method main = generateFunction("test");
@@ -102,12 +102,12 @@ public class VarArgTest extends CodegenTestCase {
     }
 
     public void testKt797() {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         blackBoxFile("regressions/kt796_797.jet");
     }
 
     public void testArrayAsVararg () throws InvocationTargetException, IllegalAccessException {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("private fun asList(vararg elems: String) = elems; fun test(ts: Array<String>) = asList(*ts); ");
         //System.out.println(generateToText());
         final Method main = generateFunction("test");
@@ -116,7 +116,7 @@ public class VarArgTest extends CodegenTestCase {
     }
 
     public void testArrayAsVararg2 () throws InvocationTargetException, IllegalAccessException {
-        createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.JDK_HEADERS);
         loadText("private fun asList(vararg elems: String) = elems; fun test(ts1: Array<String>, ts2: String) = asList(*ts1, ts2); ");
         System.out.println(generateToText());
         final Method main = generateFunction("test");
diff --git a/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java
index 464a2279dfd1151f55f02e947656dce81d1fe74f..01b59cebb8ddba0f04e591093ee7bb815721f438 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java
+++ b/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java
@@ -18,7 +18,6 @@ package org.jetbrains.jet.resolve;
 
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.impl.DocumentImpl;
-import org.jetbrains.jet.CompileCompilerDependenciesTest;
 import org.jetbrains.jet.JetLiteFixture;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,7 +29,6 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetVisitorVoid;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
-import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -45,7 +43,7 @@ public class DescriptorRendererTest extends JetLiteFixture {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk();
+        createEnvironmentWithMockJdkAndIdeaAnnotations();
     }
 
 
diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java b/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java
index 3e736e690fd1578542ddbb58aea4952ab110d981..dd8c181d342e55340ecdaa23862d01974c4fcc1b 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java
+++ b/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java
@@ -34,7 +34,7 @@ public abstract class ExtensibleResolveTestCase extends JetLiteFixture {
     protected void setUp() throws Exception {
         super.setUp();
 
-        createEnvironmentWithMockJdk(CompilerSpecialMode.STDLIB);
+        createEnvironmentWithMockJdkAndIdeaAnnotations(CompilerSpecialMode.STDLIB);
 
         expectedResolveData = getExpectedResolveData();
     }
diff --git a/compiler/tests/org/jetbrains/jet/runtime/JetNpeTest.java b/compiler/tests/org/jetbrains/jet/runtime/JetNpeTest.java
index 7d7e5fa91a363f9efa9df852afc1c3e47c397493..60aa4b3ef128679ab6700aac07a6325b6c7b1e5d 100644
--- a/compiler/tests/org/jetbrains/jet/runtime/JetNpeTest.java
+++ b/compiler/tests/org/jetbrains/jet/runtime/JetNpeTest.java
@@ -25,7 +25,7 @@ public class JetNpeTest extends CodegenTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk();
+        createEnvironmentWithMockJdkAndIdeaAnnotations();
     }
 
 
diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java
index b1e78c68ebf8c96c23f64d7ed93cd58e20c07cc4..84f915ee77dc095b576adf62a6524cfb12ac7362 100644
--- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java
+++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java
@@ -16,7 +16,6 @@
 
 package org.jetbrains.jet.types;
 
-import org.jetbrains.jet.CompileCompilerDependenciesTest;
 import org.jetbrains.jet.JetLiteFixture;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.analyzer.AnalyzeExhaust;
@@ -27,7 +26,6 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.DescriptorResolver;
 import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
-import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler;
 import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
@@ -45,7 +43,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        super.createEnvironmentWithMockJdk();
+        super.createEnvironmentWithMockJdkAndIdeaAnnotations();
         tc.setUp();
     }
 
diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java
index 415265d1f7bc4dc39187cd6fe0c664bf6c08c3bf..9f61ec8f662b08733729a9b4c827a26cceea9859 100644
--- a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java
+++ b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java
@@ -40,7 +40,7 @@ public class JetOverloadTest extends JetLiteFixture {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk();
+        createEnvironmentWithMockJdkAndIdeaAnnotations();
         InjectorForTests injector = new InjectorForTests(getProject());
         library = injector.getJetStandardLibrary();
         descriptorResolver = injector.getDescriptorResolver();
diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java
index 8f88357f684833968470e0abc984b25098df4f00..a861952075ee869058d58fd8c36fc4f2ef7c4b18 100644
--- a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java
+++ b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java
@@ -40,7 +40,7 @@ public class JetOverridingTest extends JetLiteFixture {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk();
+        createEnvironmentWithMockJdkAndIdeaAnnotations();
         InjectorForTests injector = new InjectorForTests(getProject());
         library = injector.getJetStandardLibrary();
         descriptorResolver = injector.getDescriptorResolver();
diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
index e00f0a5ed0f9f0678f3bc9d457f424e6abed1fc2..c6390d9d060ba375cd25bd8f22595cbd00415e0f 100644
--- a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
+++ b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
@@ -20,7 +20,6 @@ import com.google.common.collect.Sets;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.CompileCompilerDependenciesTest;
 import org.jetbrains.jet.JetLiteFixture;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
@@ -67,7 +66,7 @@ public class JetTypeCheckerTest extends JetLiteFixture {
     public void setUp() throws Exception {
         super.setUp();
 
-        super.createEnvironmentWithMockJdk();
+        super.createEnvironmentWithMockJdkAndIdeaAnnotations();
 
         library          = JetStandardLibrary.getInstance();
         classDefinitions = new ClassDefinitions();
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/TestWithEnvironment.java b/js/js.tests/test/org/jetbrains/k2js/test/TestWithEnvironment.java
index 17c0f30cc5a5c34358016c5abd310f3fe392e2c0..bc39f73dcccf322bd1d7866d0b4703635a6a04de 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/TestWithEnvironment.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/TestWithEnvironment.java
@@ -40,7 +40,7 @@ public abstract class TestWithEnvironment extends UsefulTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        createEnvironmentWithMockJdk();
+        createEnvironmentWithMockJdkAndIdeaAnnotations();
     }
 
     @Override
@@ -49,7 +49,7 @@ public abstract class TestWithEnvironment extends UsefulTestCase {
         super.tearDown();
     }
 
-    protected void createEnvironmentWithMockJdk() {
-        myEnvironment = JetTestUtils.createEnvironmentWithMockJdk(getTestRootDisposable());
+    protected void createEnvironmentWithMockJdkAndIdeaAnnotations() {
+        myEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable());
     }
 }