diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/JarRootsRefreshTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/JarRootsRefreshTest.java
index 35a3f1bb8c1e..53bf6e5c3ccb 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/JarRootsRefreshTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/JarRootsRefreshTest.java
@@ -73,12 +73,7 @@ public class JarRootsRefreshTest extends PlatformTestCase {
     assertTrue(jarRoot.isValid());
     PsiDirectory directory = getPsiManager().findDirectory(vLibDir);
     DataContext psiDataContext = SimpleDataContext.getSimpleContext(LangDataKeys.TARGET_PSI_ELEMENT.getName(), directory);
-    new WriteCommandAction.Simple(myProject) {
-      @Override
-      protected void run() throws Throwable {
-        new MoveHandler().invoke(myProject, new PsiElement[] {file}, psiDataContext);
-      }
-    }.execute();
+    new MoveHandler().invoke(myProject, new PsiElement[] {file}, psiDataContext);
     assertFalse(jarRoot.isValid());
 
     jarRoot = JarFileSystem.getInstance().getRootByLocal(vFile);
@@ -92,11 +87,6 @@ public class JarRootsRefreshTest extends PlatformTestCase {
     DataContext psiDataContext = SimpleDataContext.getSimpleContext(CommonDataKeys.PSI_ELEMENT.getName(), file);
     RenameHandler renameHandler = RenameHandlerRegistry.getInstance().getRenameHandler(psiDataContext);
     assertNotNull(renameHandler);
-    new WriteCommandAction.Simple(file.getProject()) {
-      @Override
-      public void run() {
-        PsiElementRenameHandler.rename(file, file.getProject(), file, null, newName);
-      }
-    }.execute();
+    PsiElementRenameHandler.rename(file, file.getProject(), file, null, newName);
   }
 }
\ No newline at end of file
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 66ec057c8403..75c5530092cc 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
@@ -1057,18 +1057,13 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
   public void moveFile(@NotNull final String filePath, @NotNull final String to, @NotNull final String... additionalFiles) {
     assertInitialized();
     final Project project = getProject();
-    new WriteCommandAction.Simple(project) {
-      @Override
-      protected void run() throws Exception {
-        configureByFiles(ArrayUtil.reverseArray(ArrayUtil.append(additionalFiles, filePath)));
-        final VirtualFile file = findFileInTempDir(to);
-        Assert.assertNotNull("Directory " + to + " not found", file);
-        Assert.assertTrue(to + " is not a directory", file.isDirectory());
-        final PsiDirectory directory = myPsiManager.findDirectory(file);
-        new MoveFilesOrDirectoriesProcessor(project, new PsiElement[]{getFile()}, directory,
-                                            false, false, null, null).run();
-      }
-    }.execute().throwException();
+    configureByFiles(ArrayUtil.reverseArray(ArrayUtil.append(additionalFiles, filePath)));
+    final VirtualFile file = findFileInTempDir(to);
+    Assert.assertNotNull("Directory " + to + " not found", file);
+    Assert.assertTrue(to + " is not a directory", file.isDirectory());
+    final PsiDirectory directory = myPsiManager.findDirectory(file);
+    new MoveFilesOrDirectoriesProcessor(project, new PsiElement[]{getFile()}, directory,
+                                        false, false, null, null).run();
   }
 
   @Override
diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/ResourceBundleTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/ResourceBundleTest.java
index 5ead1f6bbb47..45a7f37b4f4f 100644
--- a/plugins/properties/testSrc/com/intellij/lang/properties/ResourceBundleTest.java
+++ b/plugins/properties/testSrc/com/intellij/lang/properties/ResourceBundleTest.java
@@ -76,4 +76,9 @@ public class ResourceBundleTest extends LightPlatformCodeInsightFixtureTestCase
 
     assertEquals(fileNameToCheckAfter, toCheck.getName());
   }
+
+  @Override
+  protected boolean isWriteActionRequired() {
+    return false;
+  }
 }
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncRenameTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncRenameTest.java
index 4ef44f823700..2bef5bc88282 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncRenameTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncRenameTest.java
@@ -16,7 +16,6 @@
 
 package org.intellij.plugins.relaxNG;
 
-import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -80,18 +79,13 @@ public class RncRenameTest extends HighlightingTestBase {
     final PsiFile file = PsiManager.getInstance(project).findFile(copy);
     assertNotNull(file);
 
-    new WriteCommandAction.Simple(project) {
-      @Override
-      protected void run() throws Throwable {
-        myTestFixture.configureByFile("rename-in-include.rnc");
-        final RenameRefactoring refactoring = factory.createRename(file, "rename-after.rnc");
-        refactoring.setPreviewUsages(false);
-        refactoring.setSearchInComments(false);
-        refactoring.setSearchInNonJavaFiles(true);
-        refactoring.run();
-        myTestFixture.checkResultByFile("rename-in-include_after.rnc");
-      }
-    }.execute().throwException();
+    myTestFixture.configureByFile("rename-in-include.rnc");
+    final RenameRefactoring refactoring = factory.createRename(file, "rename-after.rnc");
+    refactoring.setPreviewUsages(false);
+    refactoring.setSearchInComments(false);
+    refactoring.setSearchInNonJavaFiles(true);
+    refactoring.run();
+    myTestFixture.checkResultByFile("rename-in-include_after.rnc");
 
     assertEquals("rename-after.rnc", file.getName());
   }