diff -r feb29f7d0066 -r 676dce49d8e6 tests/run-tests.py
--- a/tests/run-tests.py	Sun Oct 14 18:30:42 2012 +0200
+++ b/tests/run-tests.py	Thu Oct 18 00:33:29 2012 +0200
@@ -476,6 +476,8 @@
     py3kswitch = options.py3k_warnings and ' -3' or ''
     cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test)
     vlog("# Running", cmd)
+    if os.name == 'nt':
+        replacements.append((r'\r\n', '\n'))
     return run(cmd, wd, options, replacements)
 
 def shtest(test, wd, options, replacements):