diff -r 8fb3a6f9b0a4 Lib/test/test_email/test_email.py
--- a/Lib/test/test_email/test_email.py	Mon Aug 26 14:05:19 2013 +0200
+++ b/Lib/test/test_email/test_email.py	Fri Aug 30 20:23:15 2013 -0400
@@ -187,7 +187,7 @@
         out = BytesIO()
         gen = email.generator.BytesGenerator(out)
         gen.flatten(msg)
-        self.assertEqual(out.getvalue(), msgdata)
+        self.assertEqual(out.getvalue().replace(b'\r', b''), msgdata.replace(b'\r', b''))
 
     def test_get_decoded_payload(self):
         eq = self.assertEqual
@@ -271,6 +271,7 @@
         msg = self._msgobj('msg_01.txt')
         with openfile('msg_01.txt', 'rb') as fp:
             data = fp.read()
+        data = data.replace(b'\r', b'')
         self.assertEqual(data, bytes(msg))
         fullrepr = msg.as_bytes(unixfrom=True)
         lines = fullrepr.split(b'\n')