diff --git a/java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java b/java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java
index 8b6c7a3f34c0..b26afb406d5b 100644
--- a/java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java
+++ b/java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java
@@ -125,7 +125,7 @@ public class NavigateFromSourceTest extends BaseProjectViewTestCase {
     PsiClass psiClass = psiFile.getClasses()[0];
     final VirtualFile virtualFile = psiClass.getContainingFile().getVirtualFile();
     final JTree tree = pane.getTree();
-    virtualFile.setBinaryContent(newClassString.getBytes(CharsetToolkit.UTF8_CHARSET));
+    setBinaryContent(virtualFile, newClassString.getBytes(CharsetToolkit.UTF8_CHARSET));
 
     PlatformTestUtil.waitForAlarm(600);
 
diff --git a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
index 3aeb8bb8d14f..285957652de4 100644
--- a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
+++ b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
@@ -432,7 +432,7 @@ public abstract class CodeInsightTestCase extends PsiTestCase {
       streamsToClose.add(outputStream);
     }
     else {
-      VfsUtil.saveText(newVFile, newFileText);
+      setFileText(newVFile, newFileText);
     }
   }
 
diff --git a/platform/lang-impl/testSources/com/intellij/ide/GeneratedSourceFileChangeTrackerTest.java b/platform/lang-impl/testSources/com/intellij/ide/GeneratedSourceFileChangeTrackerTest.java
index 2800d80d8543..845c1755c80e 100644
--- a/platform/lang-impl/testSources/com/intellij/ide/GeneratedSourceFileChangeTrackerTest.java
+++ b/platform/lang-impl/testSources/com/intellij/ide/GeneratedSourceFileChangeTrackerTest.java
@@ -18,7 +18,6 @@ package com.intellij.ide;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.GeneratedSourcesFilter;
-import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
@@ -66,7 +65,7 @@ public class GeneratedSourceFileChangeTrackerTest extends CodeInsightFixtureTest
 
   public void testChangeGeneratedExternally() throws IOException {
     PsiFile file = myFixture.configureByText("Gen.txt", "");
-    VfsUtil.saveText(file.getVirtualFile(), "abc");
+    myFixture.saveText(file.getVirtualFile(), "abc");
     PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
     assertFalse(isEditedGeneratedFile(file));
   }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
index 97ea3bb4ad83..034dcedda347 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
@@ -16,6 +16,8 @@
 package org.jetbrains.plugins.gradle.importing;
 
 import com.intellij.compiler.server.BuildManager;
+import com.intellij.openapi.application.Result;
+import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.externalSystem.model.ProjectSystemId;
 import com.intellij.openapi.externalSystem.model.settings.ExternalSystemExecutionSettings;
 import com.intellij.openapi.externalSystem.settings.ExternalProjectSettings;
@@ -146,7 +148,13 @@ public abstract class GradleImportingTestCase extends ExternalSystemImportingTes
     assert wrapperJarFrom != null;
 
     final VirtualFile wrapperJarFromTo = createProjectSubFile("gradle/wrapper/gradle-wrapper.jar");
-    wrapperJarFromTo.setBinaryContent(wrapperJarFrom.contentsToByteArray());
+    new WriteAction() {
+      @Override
+      protected void run(@NotNull Result result) throws Throwable {
+        wrapperJarFromTo.setBinaryContent(wrapperJarFrom.contentsToByteArray());
+      }
+    }.execute().throwException();
+
 
     Properties properties = new Properties();
     properties.setProperty("distributionBase", "GRADLE_USER_HOME");
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelValidationTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelValidationTest.java
index c7e271838fbd..b8185781afda 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelValidationTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelValidationTest.java
@@ -15,7 +15,6 @@
  */
 package org.jetbrains.idea.maven.dom;
 
-import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -65,7 +64,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
   }
 
   public void testUnderstandingProjectSchemaWithoutNamespace() throws Exception {
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<project>" +
                      "  <dep<caret>" +
                      "</project>");
@@ -92,7 +91,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
   }
 
   public void testAbsentModelVersion() throws Throwable {
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<<error descr=\"'modelVersion' child tag should be defined\">project</error> xmlns=\"http://maven.apache.org/POM/4.0.0\"" +
                      "         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
                      "         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">" +
@@ -102,7 +101,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
   }
 
   public void testAbsentArtifactId() throws Throwable {
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<<error descr=\"'artifactId' child tag should be defined\">project</error> xmlns=\"http://maven.apache.org/POM/4.0.0\"" +
                      "         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
                      "         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">" +
@@ -112,7 +111,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
   }
 
   public void testUnknownModelVersion() throws Throwable {
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<project xmlns=\"http://maven.apache.org/POM/4.0.0\"" +
                      "         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
                      "         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">" +
@@ -130,7 +129,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
   }
 
   public void testAddingSettingsXmlReadingProblemsToProjectTag() throws Exception {
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<project>" +
                      "  <modelVersion>4.0.0</modelVersion>" +
                      "  <groupId>test</groupId>" +
@@ -141,7 +140,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
 
     readProjects();
 
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<<error descr=\"'settings.xml' has syntax errors\">project</error>>" +
                      "  <modelVersion>4.0.0</modelVersion>" +
                      "  <groupId>test</groupId>" +
@@ -152,7 +151,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
   }
 
   public void testAddingProfilesXmlReadingProblemsToProjectTag() throws Exception {
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<project>" +
                      "  <modelVersion>4.0.0</modelVersion>" +
                      "  <groupId>test</groupId>" +
@@ -163,7 +162,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
 
     readProjects();
 
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<<error descr=\"'profiles.xml' has syntax errors\">project</error>>" +
                      "  <modelVersion>4.0.0</modelVersion>" +
                      "  <groupId>test</groupId>" +
@@ -174,7 +173,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
   }
 
   public void testAddingStructureReadingProblemsToParentTag() throws Exception {
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<project>" +
                      "  <modelVersion>4.0.0</modelVersion>" +
                      "  <groupId>test</groupId>" +
@@ -189,7 +188,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
 
     readProjects();
 
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<project>" +
                      "  <modelVersion>4.0.0</modelVersion>" +
                      "  <groupId>test</groupId>" +
@@ -211,7 +210,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
                     "<version>1</version>" +
                     "<<<");
 
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<project>" +
                      "  <modelVersion>4.0.0</modelVersion>" +
                      "  <groupId>test</groupId>" +
@@ -226,7 +225,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
                      "</project>");
     readProjects();
 
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<project>" +
                      "  <modelVersion>4.0.0</modelVersion>" +
                      "  <groupId>test</groupId>" +
@@ -243,7 +242,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
   }
 
   public void testDoNotAddReadingSyntaxProblemsToProjectTag() throws Exception {
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<project>" +
                      "  <modelVersion>4.0.0</modelVersion>" +
                      "  <groupId>test</groupId>" +
@@ -254,7 +253,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
 
     readProjects();
 
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<project>" +
                      "  <modelVersion>4.0.0</modelVersion>" +
                      "  <groupId>test</groupId>" +
@@ -266,7 +265,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
   }
 
   public void testDoNotAddDependencyAndModuleProblemsToProjectTag() throws Exception {
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<project>" +
                      "  <modelVersion>4.0.0</modelVersion>" +
                      "  <groupId>test</groupId>" +
@@ -286,7 +285,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
 
     readProjects();
 
-    VfsUtil.saveText(myProjectPom,
+    myFixture.saveText(myProjectPom,
                      "<project>" +
                      "  <modelVersion>4.0.0</modelVersion>" +
                      "  <groupId>test</groupId>" +