diff --git a/build.xml b/build.xml
index eca3e33d96b..9a8e2eecc3b 100644
--- a/build.xml
+++ b/build.xml
@@ -414,6 +414,7 @@
             <arg value="${basedir}/libraries/stdlib/src"/>
             <arg value="-output"/>
             <arg value="${output}/classes/stdlib"/>
+            <arg value="-noStdlib"/>
             <arg value="-mode"/>
             <arg value="stdlib"/>
             <arg value="-classpath"/>
@@ -446,6 +447,7 @@
             <arg value="${basedir}/compiler/frontend/src"/>
             <arg value="-output"/>
             <arg value="${output}/classes/lang"/>
+            <arg value="-noStdlib"/>
             <arg value="-mode"/>
             <arg value="builtins"/>
         </java>
diff --git a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileBuiltins.java b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileBuiltins.java
index e4e9d0c870c..71dd44ab158 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileBuiltins.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileBuiltins.java
@@ -39,7 +39,7 @@ public class ForTestCompileBuiltins {
         @Override
         protected void doCompile(@NotNull File classesDir) throws Exception {
             ExitCode exitCode = new K2JVMCompiler().exec(
-                    System.err, "-output", classesDir.getPath(), "-src", "./compiler/frontend/src", "-mode", "builtins");
+                    System.err, "-output", classesDir.getPath(), "-src", "./compiler/frontend/src", "-noStdlib", "-mode", "builtins");
             if (exitCode != ExitCode.OK) {
                 throw new IllegalStateException("builtins compilation failed: " + exitCode);
             }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
index d7c8b703a9b..1192d955ceb 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
@@ -61,6 +61,7 @@ public class ForTestCompileRuntime {
         ExitCode exitCode = new K2JVMCompiler().exec(System.err,
                 "-output", destdir.getPath(),
                 "-src", "./libraries/stdlib/src",
+                "-noStdlib",
                 "-mode", "stdlib",
                 "-classpath", "out/production/runtime");
         if (exitCode != ExitCode.OK) {
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
index 4467ea4b2ca..313806d3254 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
@@ -270,6 +270,7 @@ public class JetCompiler implements TranslatingCompiler {
                 "-module", scriptFile.getAbsolutePath(),
                 "-output", path(outputDir),
                 "-tags", "-verbose", "-version",
+                "-noStdlib", "-noJdkAnnotations", "-noJdk",
                 "-mode", "idea"};
     }