3 files changed, 13 insertions, 17 deletions
diff --git a/testsuite/tests/arrows/should_fail/T2111.stderr b/testsuite/tests/arrows/should_fail/T2111.stderr
index c6cd8a7daa..4d100b3094 100644
--- a/testsuite/tests/arrows/should_fail/T2111.stderr
+++ b/testsuite/tests/arrows/should_fail/T2111.stderr
@@ -1,10 +1,8 @@
 
 T2111.hs:6:23:
-    The arrow command
+    Arrow command found where an expression was expected:
+      undefined -< x
+
+T2111.hs:6:41:
+    Arrow command found where an expression was expected:
       undefined -< x
-    was found where an expression was expected
-    In a stmt of a 'do' block: x <- undefined -< x
-    In a stmt of a 'do' block: rec { x <- undefined -< x }
-    In the expression:
-      do { rec { x <- undefined -< x };
-           undefined -< x }
diff --git a/testsuite/tests/arrows/should_fail/all.T b/testsuite/tests/arrows/should_fail/all.T
index 2aaa27d9ec..ef7aac6fa0 100644
--- a/testsuite/tests/arrows/should_fail/all.T
+++ b/testsuite/tests/arrows/should_fail/all.T
@@ -1,6 +1,10 @@
 setTestOpts(only_compiler_types(['ghc']))
 
-test('arrowfail001', normal, compile_fail, [''])
+test('arrowfail001', expect_broken(5267), compile_fail, [''])
+ # arrowfail001 gets an ASSERT error in the stage1 compiler
+ # because we simply are not typechecking arrow commands
+ # correcly.  See Trac #5267, #5609, #5605
+
 test('arrowfail002', normal, compile_fail, [''])
 test('arrowfail003', normal, compile_fail, [''])
 test('arrowfail004', normal, compile_fail, [''])
diff --git a/testsuite/tests/arrows/should_fail/arrowfail003.stderr b/testsuite/tests/arrows/should_fail/arrowfail003.stderr
index 39a6b48139..25e8efd0b1 100644
--- a/testsuite/tests/arrows/should_fail/arrowfail003.stderr
+++ b/testsuite/tests/arrows/should_fail/arrowfail003.stderr
@@ -1,14 +1,8 @@
 
 arrowfail003.hs:8:7:
-    The arrow command
+    Arrow command found where an expression was expected:
       returnA -< []
-    was found where an expression was expected
-    In the expression: returnA -< []
-    In an equation for `foo': foo = returnA -< []
 
 arrowfail003.hs:9:7:
-    The arrow command
-      (|zeroArrow |)
-    was found where an expression was expected
-    In the expression: (|zeroArrow |)
-    In an equation for `bar': bar = (|zeroArrow |)
+    Arrow command found where an expression was expected:
+      (| zeroArrow |)