diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java
index fc4c3af7881b..4a4332789cb0 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java
@@ -630,6 +630,9 @@ public interface CodeInsightTestFixture extends IdeaProjectTestFixture {
   @NotNull
   PsiManager getPsiManager();
 
+  @Nullable
+  PsiManager getPsiManagerOrNull();
+
   /**
    * @return {@code null} if the only item was auto-completed.
    * @see #completeBasicAllCarets(Character)
diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
index 4999d42436c8..bfa3f2f883cb 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
@@ -1283,6 +1283,11 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
     return myPsiManager;
   }
 
+  @Override
+  public final @Nullable PsiManager getPsiManagerOrNull() {
+    return myPsiManager;
+  }
+
   @Override
   public LookupElement[] complete(@NotNull CompletionType type) {
     return myEditorTestFixture.complete(type);