diff --git a/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeCompletion.java b/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeCompletion.java
index 151482756663..e5dfba9f1543 100644
--- a/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeCompletion.java
+++ b/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeCompletion.java
@@ -46,10 +46,7 @@ import junit.framework.TestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jetCheck.Generator;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @author peter
@@ -90,12 +87,13 @@ public class InvokeCompletion extends ActionOnFile {
         PsiTestUtil.checkPsiStructureWithCommit(getFile(), PsiTestUtil::checkStubsMatchText);
         //noinspection deprecation
         Editor caretEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, getFile());
-        performCompletion(caretEditor, PsiUtilBase.getPsiFileInEditor(caretEditor, project), completionChar, env);
+        performCompletion(caretEditor, Objects.requireNonNull(PsiUtilBase.getPsiFileInEditor(caretEditor, project)), completionChar, env);
         PsiTestUtil.checkPsiStructureWithCommit(getFile(), PsiTestUtil::checkStubsMatchText);
       }
       catch (Throwable e) {
         LOG.debug("Text before completion:\n" + textBefore);
         env.logMessage("Error happened, the file's text before invoking printed to the debug log, search for 'Text before completion' there");
+        throw e;
       }
       finally {
         Disposer.dispose(raiseCompletionLimit);
diff --git a/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeIntention.java b/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeIntention.java
index 9f2c43c59eeb..76f778fd05e3 100644
--- a/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeIntention.java
+++ b/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeIntention.java
@@ -25,6 +25,8 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.impl.PushedFilePropertiesUpdater;
+import com.intellij.openapi.util.Conditions;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
@@ -74,13 +76,16 @@ public class InvokeIntention extends ActionOnFile {
     return result;
   }
 
-  private void doInvokeIntention(int offset, @Nullable Environment env) {
+  private void doInvokeIntention(int offset, Environment env) {
     Project project = getProject();
     Editor editor = FileEditorManager.getInstance(project).openTextEditor(new OpenFileDescriptor(project, getVirtualFile(), offset), true);
+    assert editor != null;
 
-    boolean hasErrors = !highlightErrors(project, editor).isEmpty();
+    boolean containsErrorElements = MadTestingUtil.containsErrorElements(getFile().getViewProvider());
+    boolean hasErrors = !highlightErrors(project, editor).isEmpty() || containsErrorElements;
 
     PsiFile file = PsiUtilBase.getPsiFileInEditor(editor, getProject());
+    assert file != null;
     IntentionAction intention = chooseIntention(env, getAvailableIntentions(editor, file));
     if (intention == null) return;
 
@@ -98,8 +103,9 @@ public class InvokeIntention extends ActionOnFile {
     Long stampBefore = changedDocument == null ? null : changedDocument.getModificationStamp();
 
     Disposable disposable = Disposer.newDisposable();
-    if (MadTestingUtil.containsErrorElements(file.getViewProvider())) {
+    if (containsErrorElements) {
       Registry.get("ide.check.structural.psi.text.consistency.in.tests").setValue(false, disposable);
+      Disposer.register(disposable, this::restoreAfterPotentialPsiTextInconsistency);
     }
 
     Runnable r = () -> CodeInsightTestFixtureImpl.invokeIntention(intention, file, editor, intention.getText());
@@ -140,9 +146,7 @@ public class InvokeIntention extends ActionOnFile {
     }
     catch (Throwable error) {
       LOG.debug("Error occurred, text before intention invocation:\n" + textBefore);
-      if (env != null) {
-        env.logMessage("Error happened, the file's text before invoking printed to the debug log, search for 'text before intention invocation' there");
-      }
+      env.logMessage("Error happened, the file's text before invoking printed to the debug log, search for 'text before intention invocation' there");
       throw error;
     }
     finally {
@@ -150,6 +154,10 @@ public class InvokeIntention extends ActionOnFile {
     }
   }
 
+  private void restoreAfterPotentialPsiTextInconsistency() {
+    PushedFilePropertiesUpdater.getInstance(getProject()).filePropertiesChanged(getVirtualFile(), Conditions.alwaysTrue());
+  }
+
   protected List<String> extractCommentsReformattedToSingleWhitespace(PsiFile file) {
     return PsiTreeUtil.findChildrenOfType(file, PsiComment.class)
       .stream()
@@ -183,7 +191,6 @@ public class InvokeIntention extends ActionOnFile {
     return changedFile == null ? null : changedFile.getViewProvider().getDocument();
   }
 
-  @Nullable
   private List<IntentionAction> getAvailableIntentions(Editor editor, PsiFile file) {
     List<IntentionAction> actions =
       ContainerUtil.filter(CodeInsightTestFixtureImpl.getAvailableIntentions(editor, file), myPolicy::mayInvokeIntention);