diff --git a/java/java-tests/testSrc/com/intellij/psi/StubAstSwitchTest.groovy b/java/java-tests/testSrc/com/intellij/psi/StubAstSwitchTest.groovy
index b7b39fb7a017..936bb1c84203 100644
--- a/java/java-tests/testSrc/com/intellij/psi/StubAstSwitchTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/psi/StubAstSwitchTest.groovy
@@ -66,7 +66,9 @@ class StubAstSwitchTest extends LightCodeInsightFixtureTestCase {
     int count = 100
     List<PsiClass> classList = (0..<count).collect {
       myFixture.addClass("class Foo$it { " +
-                         (0..<100).collect { "void foo$it(int i, boolean b, Object o) {}" }.join("\n") +
+                         "void foo$it(" +
+                         (0..250).collect { "int i$it"}.join(", ") +
+                         ") {}" +
                          " }")
     }
     CountDownLatch latch = new CountDownLatch(count)
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
index 7c883dc0207a..1837a2c7c315 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
@@ -202,7 +202,14 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
     }
     treeElement.setPsi(this);
 
-    List<Pair<StubBasedPsiElementBase, CompositeElement>> bindings = calcStubAstBindings(treeElement, cachedDocument);
+    List<Pair<StubBasedPsiElementBase, CompositeElement>> bindings;
+    LazyParseableElement.setSuppressEagerPsiCreation(true);
+    try {
+      bindings = calcStubAstBindings(treeElement, cachedDocument);
+    }
+    finally {
+      LazyParseableElement.setSuppressEagerPsiCreation(false);
+    }
 
     synchronized (PsiLock.LOCK) {
       FileElement existing = derefTreeElement();
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
index 15b605ccdba5..a09ab199b95a 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
@@ -48,6 +48,7 @@ public class LazyParseableElement extends CompositeElement {
   // Under no circumstances should you grab the PSI_LOCK while holding this lock.
   private final ChameleonLock lock = new ChameleonLock();
   private CharSequence myText; /** guarded by {@link #lock} */
+  private static final ThreadLocal<Boolean> ourSuppressEagerPsiCreation = new ThreadLocal<Boolean>();
 
   public LazyParseableElement(@NotNull IElementType type, CharSequence text) {
     super(type);
@@ -181,9 +182,11 @@ public class LazyParseableElement extends CompositeElement {
       super.rawAddChildrenWithoutNotifications((TreeElement)parsedNode);
     }
 
-    // create PSI all at once, to reduce contention of PsiLock in CompositeElement.getPsi()
-    // create PSI outside the 'lock' since this method grabs PSI_LOCK and deadlock is possible when someone else locks in the other order.
-    createAllChildrenPsiIfNecessary();
+    if (!Boolean.TRUE.equals(ourSuppressEagerPsiCreation.get())) {
+      // create PSI all at once, to reduce contention of PsiLock in CompositeElement.getPsi()
+      // create PSI outside the 'lock' since this method grabs PSI_LOCK and deadlock is possible when someone else locks in the other order.
+      createAllChildrenPsiIfNecessary();
+    }
   }
 
   @Override
@@ -222,4 +225,8 @@ public class LazyParseableElement extends CompositeElement {
   public static void setParsingAllowed(boolean allowed) {
     ourParsingAllowed = allowed;
   }
+  
+  public static void setSuppressEagerPsiCreation(boolean suppress) {
+    ourSuppressEagerPsiCreation.set(suppress);
+  }
 }