diff --git a/java/java-runtime/intellij.java.rt.iml b/java/java-runtime/intellij.java.rt.iml
index 1d97c3429d1f..42af6d96d6ab 100644
--- a/java/java-runtime/intellij.java.rt.iml
+++ b/java/java-runtime/intellij.java.rt.iml
@@ -22,5 +22,6 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="JUnit4" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-runtime/src/com/intellij/rt/execution/junit/ComparisonFailureData.java b/java/java-runtime/src/com/intellij/rt/execution/junit/ComparisonFailureData.java
index d1813c95a535..05f978ddd4fb 100644
--- a/java/java-runtime/src/com/intellij/rt/execution/junit/ComparisonFailureData.java
+++ b/java/java-runtime/src/com/intellij/rt/execution/junit/ComparisonFailureData.java
@@ -199,6 +199,15 @@ public class ComparisonFailureData {
       }
     }
 
+    if (assertion instanceof FileComparisonFailure) {
+      final FileComparisonFailure comparisonFailure = (FileComparisonFailure)assertion;
+      String actual = comparisonFailure.getActual();
+      String expected = comparisonFailure.getExpected();
+      if (actual != null && expected != null) {
+        return new ComparisonFailureData(expected, actual, comparisonFailure.getFilePath(), comparisonFailure.getActualFilePath());
+      }
+    }
+
     ComparisonFailureData commonAssertion = createCommonAssertion(assertion);
     if (commonAssertion != null) return commonAssertion;
 
diff --git a/platform/testFramework/core/src/com/intellij/rt/execution/junit/FileComparisonFailure.java b/java/java-runtime/src/com/intellij/rt/execution/junit/FileComparisonFailure.java
similarity index 100%
rename from platform/testFramework/core/src/com/intellij/rt/execution/junit/FileComparisonFailure.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/FileComparisonFailure.java