diff --git a/remove.sh b/remove.sh
new file mode 100755
index 00000000000..2b067d09bc6
--- /dev/null
+++ b/remove.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+rm `find "testData" -name "*.kt.tmp"`
diff --git a/rename.sh b/rename.sh
new file mode 100755
index 00000000000..e131fdc40c6
--- /dev/null
+++ b/rename.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+rename -f s/.kt.tmp/.kt/ `find "testData" -name "*.kt.tmp"`
diff --git a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java
index e7a536f9dde..8906c793fec 100644
--- a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java
+++ b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java
@@ -13,6 +13,7 @@ import java.io.File;
 import java.io.IOException;
 
 import static org.apache.commons.io.FileUtils.readFileToString;
+import static org.apache.commons.io.FileUtils.writeStringToFile;
 import static org.jetbrains.jet.j2k.TestCaseBuilder.getTestDataPathBase;
 
 /**
@@ -48,10 +49,11 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     else if (javaFile.getParent().endsWith("/class")) actual = classToSingleLineKotlin(javaCode);
     else if (javaFile.getParent().endsWith("/class_mult")) actual = classToKotlin(javaCode);
 
-    else if (javaFile.getParent().endsWith("/file")) actual = fileToSingleLineKotlin(javaCode);
-    else if (javaFile.getParent().endsWith("/file_mult")) actual = fileToKotlin(javaCode);
+    else if (javaFile.getParent().endsWith("/file")) actual = fileToKotlin(javaCode);
 
     assert !actual.equals("");
+    if (!expected.equals(actual))
+      writeStringToFile(new File(kotlinPath + ".tmp"), actual);
     Assert.assertEquals(expected, actual);
   }
 
@@ -99,10 +101,6 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     return prettify(Converter.fileToFile((PsiJavaFile) myFile).toKotlin());
   }
 
-  protected String fileToSingleLineKotlin(String text) throws IOException {
-    return toSingleLine(fileToKotlin(text));
-  }
-
   @NotNull
   protected String classToKotlin(String text) throws IOException {
     configureFromText(text);
diff --git a/testData/ast/file/file/packageWithClass.kt b/testData/ast/file/file/packageWithClass.kt
index 399e3faa127..f08440c2d5d 100644
--- a/testData/ast/file/file/packageWithClass.kt
+++ b/testData/ast/file/file/packageWithClass.kt
@@ -1 +1,4 @@
-namespace test { class C { } }
\ No newline at end of file
+namespace test {
+class C {
+}
+}
\ No newline at end of file
diff --git a/testData/ast/file/file/packageWithClasses.kt b/testData/ast/file/file/packageWithClasses.kt
index b5c20e59452..c57933a501a 100644
--- a/testData/ast/file/file/packageWithClasses.kt
+++ b/testData/ast/file/file/packageWithClasses.kt
@@ -1 +1,6 @@
-namespace { class A { } class B { } }
\ No newline at end of file
+namespace {
+class A {
+}
+class B {
+}
+}
\ No newline at end of file
diff --git a/testData/ast/file/file_mult/packageWithImports.jav b/testData/ast/file/file/packageWithImports.jav
similarity index 100%
rename from testData/ast/file/file_mult/packageWithImports.jav
rename to testData/ast/file/file/packageWithImports.jav
diff --git a/testData/ast/file/file_mult/packageWithImports.kt b/testData/ast/file/file/packageWithImports.kt
similarity index 100%
rename from testData/ast/file/file_mult/packageWithImports.kt
rename to testData/ast/file/file/packageWithImports.kt
diff --git a/testData/ast/file/file_mult/packageWithMixedImports.jav b/testData/ast/file/file/packageWithMixedImports.jav
similarity index 100%
rename from testData/ast/file/file_mult/packageWithMixedImports.jav
rename to testData/ast/file/file/packageWithMixedImports.jav
diff --git a/testData/ast/file/file_mult/packageWithMixedImports.kt b/testData/ast/file/file/packageWithMixedImports.kt
similarity index 100%
rename from testData/ast/file/file_mult/packageWithMixedImports.kt
rename to testData/ast/file/file/packageWithMixedImports.kt
diff --git a/testData/ast/file/file/packageWithOpenClass.kt b/testData/ast/file/file/packageWithOpenClass.kt
index 3b7f5a190e6..17aa91ce5cb 100644
--- a/testData/ast/file/file/packageWithOpenClass.kt
+++ b/testData/ast/file/file/packageWithOpenClass.kt
@@ -1 +1,4 @@
-namespace test { open class C { } }
\ No newline at end of file
+namespace test {
+open class C {
+}
+}
\ No newline at end of file
diff --git a/testData/ast/file/file_mult/packageWithStaticImports.jav b/testData/ast/file/file/packageWithStaticImports.jav
similarity index 100%
rename from testData/ast/file/file_mult/packageWithStaticImports.jav
rename to testData/ast/file/file/packageWithStaticImports.jav
diff --git a/testData/ast/file/file_mult/packageWithStaticImports.kt b/testData/ast/file/file/packageWithStaticImports.kt
similarity index 100%
rename from testData/ast/file/file_mult/packageWithStaticImports.kt
rename to testData/ast/file/file/packageWithStaticImports.kt
diff --git a/testData/ast/function/file/override.kt b/testData/ast/function/file/override.kt
index 0d941e24a2d..706b160fda9 100644
--- a/testData/ast/function/file/override.kt
+++ b/testData/ast/function/file/override.kt
@@ -1 +1,10 @@
-namespace { open class A { fun a() : Unit { } } class B : A { override fun a() : Unit { } } }
\ No newline at end of file
+namespace {
+open class A {
+fun a() : Unit {
+}
+}
+class B : A {
+override fun a() : Unit {
+}
+}
+}
\ No newline at end of file