diff --git a/java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java b/java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java
index a93f50361cf6..cece25303181 100644
--- a/java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java
+++ b/java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java
@@ -18,7 +18,6 @@ package com.intellij.codeInspection;
 import com.intellij.CommonBundle;
 import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.QuickFixBundle;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
@@ -60,6 +59,11 @@ public class MoveToPackageFix implements LocalQuickFix {
         && myTargetPackage != null;
   }
 
+  @Override
+  public boolean startInWriteAction() {
+    return false;
+  }
+
   @Override
   public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor) {
     PsiElement element = descriptor.getPsiElement();
@@ -68,15 +72,6 @@ public class MoveToPackageFix implements LocalQuickFix {
 
     if (!FileModificationService.getInstance().prepareFileForWrite(myFile)) return;
 
-    ApplicationManager.getApplication().invokeLater(new Runnable() {
-      @Override
-      public void run() {
-        chooseDirectoryAndMove(project, myFile);
-      }
-    });
-  }
-
-  private void chooseDirectoryAndMove(Project project, PsiFile myFile) {
     try {
       String error;
       PsiDirectory directory = null;
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ReplaceMethodRefWithLambdaIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ReplaceMethodRefWithLambdaIntention.java
index 3d833ba3e5ee..63fcb7792478 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ReplaceMethodRefWithLambdaIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ReplaceMethodRefWithLambdaIntention.java
@@ -15,8 +15,6 @@
  */
 package com.siyeh.ipp.types;
 
-import com.intellij.openapi.application.Application;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.*;
@@ -38,22 +36,17 @@ public class ReplaceMethodRefWithLambdaIntention extends Intention {
   @Override
   protected void processIntention(@NotNull PsiElement element) {}
 
+  @Override
+  public boolean startInWriteAction() {
+    return false;
+  }
+
   @Override
   protected void processIntention(final Editor editor, @NotNull PsiElement element) {
     final PsiMethodReferenceExpression referenceExpression = PsiTreeUtil.getParentOfType(element, PsiMethodReferenceExpression.class);
     final PsiLambdaExpression expr = referenceExpression != null ? LambdaRefactoringUtil.convertMethodReferenceToLambda(referenceExpression, false, true) : null;
     if (expr == null) return;
-    final Runnable runnable = new Runnable() {
-      public void run() {
-        LambdaRefactoringUtil.removeSideEffectsFromLambdaBody(editor, expr);
-      }
-    };
-    final Application application = ApplicationManager.getApplication();
-    if (application.isUnitTestMode()) {
-      runnable.run();
-    } else {
-      application.invokeLater(runnable);
-    }
+    LambdaRefactoringUtil.removeSideEffectsFromLambdaBody(editor, expr);
   }
 
   private static class MethodRefPredicate implements PsiElementPredicate {
diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeQuickFix.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeQuickFix.java
index fa6a17e74a27..11d235c86c8b 100644
--- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeQuickFix.java
+++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeQuickFix.java
@@ -49,14 +49,13 @@ public class I18nizeQuickFix implements LocalQuickFix, I18nQuickFixHandler {
   private TextRange mySelectionRange;
 
   @Override
-  public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor) {
-    // do it later because the fix was called inside writeAction
-    ApplicationManager.getApplication().invokeLater(new Runnable(){
-      @Override
-      public void run() {
-        doFix(descriptor, project);
-      }
-    });
+  public final void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor) {
+    doFix(descriptor, project);
+  }
+
+  @Override
+  public boolean startInWriteAction() {
+    return false;
   }
 
   @Override