--- a/tests/run-tests.py	Thu Jun 12 01:28:22 2014 +0530
+++ b/tests/run-tests.py	Fri Jun 13 16:36:53 2014 -0500
@@ -286,6 +286,9 @@
     servefail = False
     lines = []
     for line in difflib.unified_diff(expected, output, ref, err):
+        if line.startswith('+++') or line.startswith('---'):
+            if line.endswith(' \n'):
+                line = line[:-2] + '\n'
         lines.append(line)
         if not servefail and line.startswith(
                              '+  abort: child process failed to start'):