diff --git a/java/java-tests/testSrc/com/intellij/java/psi/OptimizeImportsTestCase.java b/java/java-tests/testSrc/com/intellij/java/psi/OptimizeImportsTestCase.java
index 675838b7d9f1..6df32515b61b 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/OptimizeImportsTestCase.java
+++ b/java/java-tests/testSrc/com/intellij/java/psi/OptimizeImportsTestCase.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public abstract class OptimizeImportsTestCase extends LightJavaCodeInsightFixtureTestCase {
   protected void doTest(@NotNull String extension) {
-    WriteCommandAction.runWriteCommandAction(null, () -> {
+    WriteCommandAction.runWriteCommandAction(getProject(), () -> {
       String fileName = getTestName(false) + extension;
       try {
         PsiFile file = myFixture.configureByFile(fileName);
diff --git a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java
index fea19b432514..2e590b700ee2 100644
--- a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java
+++ b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java
@@ -147,7 +147,7 @@ public abstract class TypeMigrationTestBase extends LightMultiFileTestCase {
     final UsageInfo[] usages = pr.findUsages();
     final String report = pr.getLabeler().getMigrationReport();
 
-    WriteCommandAction.runWriteCommandAction(null, () -> pr.performRefactoring(usages));
+    WriteCommandAction.runWriteCommandAction(getProject(), () -> pr.performRefactoring(usages));
 
     WriteCommandAction.runWriteCommandAction(getProject(), () -> PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting());
 
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java b/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java
index b8830015c3ee..e8b8d8874d67 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java
@@ -161,7 +161,7 @@ public final class PostprocessReformattingAspect implements PomModelAspect {
     atomic(new Runnable() {
       @Override
       public void run() {
-        if (isDisabled() || getContext().myPostponedCounter == 0 && !ApplicationManager.getApplication().isUnitTestMode()) return;
+        if (isDisabled() || getContext().myPostponedCounter == 0) return;
         final TreeChangeEvent changeSet = (TreeChangeEvent)event.getChangeSet(myTreeAspect.getValue());
         if (changeSet == null) return;
         final PsiElement psiElement = changeSet.getRootElement().getPsi();
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyRangeTypeCheckTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyRangeTypeCheckTest.java
index beba710a728a..959a25a045c1 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyRangeTypeCheckTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyRangeTypeCheckTest.java
@@ -7,7 +7,6 @@ import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.impl.source.PostprocessReformattingAspect;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
 import org.jetbrains.plugins.groovy.codeInspection.GroovyFix;
@@ -35,9 +34,8 @@ public class GroovyRangeTypeCheckTest extends LightJavaCodeInsightFixtureTestCas
 
     LocalQuickFix[] fixes = {fix};
     final ProblemDescriptor descriptor = InspectionManager.getInstance(getProject()).createProblemDescriptor(range, "bla-bla", false, fixes, ProblemHighlightType.WEAK_WARNING);
-    WriteCommandAction.runWriteCommandAction(null, () -> {
+    WriteCommandAction.runWriteCommandAction(getProject(), () -> {
       fix.applyFix(myFixture.getProject(), descriptor);
-      PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
     });
 
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/ConvertMapToClassTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/ConvertMapToClassTest.java
index 1bfb470c2b21..c473d7f88f72 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/ConvertMapToClassTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/ConvertMapToClassTest.java
@@ -66,7 +66,7 @@ public class ConvertMapToClassTest extends GrIntentionTestCase {
     final GrTypeDefinition foo = ConvertMapToClassIntention.createClass(getProject(), map.getNamedArguments(), "", "Foo");
     myFixture.addFileToProject(getTestName(true) + "/Foo.groovy", foo.getContainingFile().getText());
     final PsiClass psiClass = myFixture.findClass("Foo");
-    WriteCommandAction.runWriteCommandAction(null, () -> ConvertMapToClassIntention
+    WriteCommandAction.runWriteCommandAction(getProject(), () -> ConvertMapToClassIntention
       .replaceMapWithClass(getProject(), map, psiClass, ConvertMapToClassIntention.checkForReturnFromMethod(map),
                            ConvertMapToClassIntention.checkForVariableDeclaration(map),
                            ConvertMapToClassIntention.checkForMethodParameter(map)));
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduce/IntroduceConstantTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduce/IntroduceConstantTest.groovy
index 5e23ff32bd98..31329bcfa56c 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduce/IntroduceConstantTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduce/IntroduceConstantTest.groovy
@@ -21,7 +21,6 @@ import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiModifier
 import com.intellij.psi.PsiType
-import com.intellij.psi.impl.source.PostprocessReformattingAspect
 import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
 import com.intellij.util.VisibilityUtil
@@ -32,7 +31,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpres
 import org.jetbrains.plugins.groovy.refactoring.introduce.constant.GrIntroduceConstantHandler
 import org.jetbrains.plugins.groovy.refactoring.introduce.constant.GrIntroduceConstantSettings
 import org.jetbrains.plugins.groovy.util.TestUtils
-
 /**
  * @author Maxim.Medvedev
  */
@@ -107,9 +105,8 @@ class IntroduceConstantTest extends LightJavaCodeInsightFixtureTestCase {
     def type = getType(useExplicitType, expression, variable, stringPart)
     final GrIntroduceConstantSettings settings = new MockIntroduceConstantSettings(targetClass, replaceAllOccurrences, type, modifier)
 
-    WriteCommandAction.runWriteCommandAction(null) {
+    WriteCommandAction.runWriteCommandAction(project) {
       handler.runRefactoring(context, settings)
-      PostprocessReformattingAspect.getInstance(project).doPostponedFormatting()
     }
     myFixture.checkResultByFile(getTestName(false) + "_after.groovy", true)
   }
diff --git a/plugins/groovy/testdata/intentions/convertMapToClass/variableTypeReplace/Expected.groovy b/plugins/groovy/testdata/intentions/convertMapToClass/variableTypeReplace/Expected.groovy
index b6dc533bb2f6..c9455d082d41 100644
--- a/plugins/groovy/testdata/intentions/convertMapToClass/variableTypeReplace/Expected.groovy
+++ b/plugins/groovy/testdata/intentions/convertMapToClass/variableTypeReplace/Expected.groovy
@@ -1,4 +1,4 @@
 class Foo {
 String a
-Date b
+    Date b
 }
\ No newline at end of file