diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitExpectedPatternsTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitExpectedPatternsTest.java
index 56e8cf3ea2e6..047646a0eb55 100644
--- a/plugins/junit/test/com/intellij/execution/junit/JUnitExpectedPatternsTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/JUnitExpectedPatternsTest.java
@@ -24,4 +24,11 @@ public class JUnitExpectedPatternsTest {
   public void testArrayComparison() throws Exception {
     Assert.assertNotNull(ExpectedPatterns.createExceptionNotification("arrays first differed at element [0]; expected: java.lang.String<Text> but was: java.lang.StringBuilder<Text>"));
   }
+
+  @Test
+  public void testHamcrestAssertThatWithReason() throws Exception {
+    Assert.assertNotNull(ExpectedPatterns.createExceptionNotification("reason\n" +
+                                                                      "Expected: is \"aaa\\naa\"\n" +
+                                                                      "     but: was \"bbb\\nbb\""));
+  }
 }
diff --git a/plugins/junit_rt/src/com/intellij/junit4/ExpectedPatterns.java b/plugins/junit_rt/src/com/intellij/junit4/ExpectedPatterns.java
index ef879e7fa64f..34812eaf3772 100644
--- a/plugins/junit_rt/src/com/intellij/junit4/ExpectedPatterns.java
+++ b/plugins/junit_rt/src/com/intellij/junit4/ExpectedPatterns.java
@@ -27,7 +27,7 @@ public class ExpectedPatterns extends AbstractExpectedPatterns {
 
   private static final String[] PATTERN_STRINGS = new String[]{
     "\nexpected: is \"(.*)\"\n\\s*got: \"(.*)\"\n",
-    "\nexpected: is \"(.*)\"\n\\s*but: was \"(.*)\"",
+    ".*?\nexpected: is \"(.*)\"\n\\s*but: was \"(.*)\"",
     "\nexpected: (.*)\n\\s*got: (.*)",
     ".*?\\s*expected same:<(.*)> was not:<(.*)>",
     ".*?\\s*expected:<(.*?)> but was:<(.*?)>",