diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java
index 08570072682c..4c62637bf832 100644
--- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java
@@ -32,7 +32,7 @@ import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.*;
-import com.intellij.psi.formatter.java.FormatterTestUtils.Action;
+import com.intellij.formatting.FormatterTestUtils.Action;
 import com.intellij.testFramework.LightIdeaTestCase;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.text.LineReader;
@@ -44,8 +44,8 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-import static com.intellij.psi.formatter.java.FormatterTestUtils.ACTIONS;
-import static com.intellij.psi.formatter.java.FormatterTestUtils.Action.*;
+import static com.intellij.formatting.FormatterTestUtils.ACTIONS;
+import static com.intellij.formatting.FormatterTestUtils.Action.*;
 
 /**
  * Base class for java formatter tests that holds utility methods.
diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/FormatWithContextTest.kt b/java/java-tests/testSrc/com/intellij/psi/formatter/java/FormatWithContextTest.kt
index 827c8de6cf0d..fdc1606a2245 100644
--- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/FormatWithContextTest.kt
+++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/FormatWithContextTest.kt
@@ -15,6 +15,7 @@
  */
 package com.intellij.psi.formatter.java
 
+import com.intellij.formatting.FormatterTestUtils
 import com.intellij.openapi.util.TextRange
 
 
diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterAlignmentTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterAlignmentTest.java
index 86665e7cc07b..c7098116251a 100644
--- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterAlignmentTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterAlignmentTest.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.util.IncorrectOperationException;
 
-import static com.intellij.psi.formatter.java.FormatterTestUtils.Action.REFORMAT_WITH_CONTEXT;
+import static com.intellij.formatting.FormatterTestUtils.Action.REFORMAT_WITH_CONTEXT;
 
 /**
  * Is intended to hold specific java formatting tests for alignment settings (
diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaIndenterTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaIndenterTest.java
index a4c49c027792..ee3cd51dc752 100644
--- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaIndenterTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaIndenterTest.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.psi.formatter.java;
 
+import com.intellij.formatting.FormatterTestUtils;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/FormatterTestUtils.java b/platform/testFramework/src/com/intellij/formatting/FormatterTestUtils.java
similarity index 92%
rename from java/java-tests/testSrc/com/intellij/psi/formatter/java/FormatterTestUtils.java
rename to platform/testFramework/src/com/intellij/formatting/FormatterTestUtils.java
index 880847d984be..efa11d016002 100644
--- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/FormatterTestUtils.java
+++ b/platform/testFramework/src/com/intellij/formatting/FormatterTestUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.psi.formatter.java;
+package com.intellij.formatting;
 
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.editor.Document;
@@ -62,16 +62,16 @@ public class FormatterTestUtils {
     }
   }
   
-  public static void doTest(@NotNull Project project,
-                            @NotNull String ext, 
-                            @NotNull String before, 
-                            @NotNull String after,
-                            @NotNull Action action) {
+  public static void testFormatting(@NotNull Project project,
+                                    @NotNull String ext,
+                                    @NotNull String before,
+                                    @NotNull String after,
+                                    @NotNull Action action) {
     String fileName = "FTU." + ext;
     FileType fileType = FileTypeManager.getInstance().getFileTypeByFileName(fileName);
 
     FormatData data = extractFormatData(before);
-    PsiFile file = PsiFileFactory.getInstance(project).createFileFromText(fileName, fileType, data.text);
+    PsiFile file = PsiFileFactory.getInstance(project).createFileFromText(fileName, fileType, data.text, System.currentTimeMillis(), true);
 
     PsiDocumentManager manager = PsiDocumentManager.getInstance(project);
     Document document = manager.getDocument(file);