--- a/tests/run-tests.py	Mon Jun 06 16:52:03 2011 +0200
+++ b/tests/run-tests.py	Mon Jun 06 16:42:56 2011 +0200
@@ -277,8 +277,12 @@
     return missing, failed
 
 def showdiff(expected, output, ref, err):
-    for line in difflib.unified_diff(expected, output, ref, err):
-        sys.stdout.write(line)
+    try:
+        for line in difflib.unified_diff(expected, output, ref, err):
+            sys.stdout.write(line)
+    except IOError, ex:
+        print >>sys.stderr, 'BORKEN PIPE', ex.errno
+        pass
 
 def findprogram(program):
     """Search PATH for a executable program"""
@@ -765,8 +769,12 @@
         fail("returned error code %d" % ret)
 
     if not options.verbose:
-        sys.stdout.write(mark)
-        sys.stdout.flush()
+        try:
+            sys.stdout.write(mark)
+            sys.stdout.flush()
+        except IOError, ex:
+            print >>sys.stderr, 'BORKEN PIPE', ex.errno
+            pass
 
     killdaemons()