diff --git a/Lib/email/iterators.py b/Lib/email/iterators.py
index 4f2c84c0994..155e19eace5 100644
--- a/Lib/email/iterators.py
+++ b/Lib/email/iterators.py
@@ -63,9 +63,9 @@ def _structure(msg, fp=None, level=0, include_default=False):
     if fp is None:
         fp = sys.stdout
     tab = ' ' * (level * 4)
-    print(tab + msg.get_content_type(), end=' ', file=fp)
+    print(tab + msg.get_content_type(), end='', file=fp)
     if include_default:
-        print('[%s]' % msg.get_default_type(), file=fp)
+        print(' [%s]' % msg.get_default_type(), file=fp)
     else:
         print(file=fp)
     if msg.is_multipart():
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index 0a25a67abb3..c3269d75811 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -54,10 +54,9 @@ class TestEmailBase(unittest.TestCase):
         if first != second:
             sfirst = str(first)
             ssecond = str(second)
-            diff = difflib.ndiff(sfirst.splitlines(), ssecond.splitlines())
-            fp = StringIO()
-            print(NL, NL.join(diff), file=fp)
-            raise self.failureException, fp.getvalue()
+            diff = difflib.ndiff(sfirst.splitlines(True),
+                                 ssecond.splitlines(True))
+            raise self.failureException(NL + "".join(diff))
 
     def _msgobj(self, filename):
         fp = openfile(findfile(filename))
diff --git a/Lib/email/test/test_email_renamed.py b/Lib/email/test/test_email_renamed.py
index 532b146a04b..21061b07254 100644
--- a/Lib/email/test/test_email_renamed.py
+++ b/Lib/email/test/test_email_renamed.py
@@ -55,10 +55,9 @@ class TestEmailBase(unittest.TestCase):
         if first != second:
             sfirst = str(first)
             ssecond = str(second)
-            diff = difflib.ndiff(sfirst.splitlines(), ssecond.splitlines())
-            fp = StringIO()
-            print(NL, NL.join(diff), file=fp)
-            raise self.failureException, fp.getvalue()
+            diff = difflib.ndiff(sfirst.splitlines(True),
+                                 ssecond.splitlines(True))
+            raise self.failureException(NL + "".join(diff))
 
     def _msgobj(self, filename):
         fp = openfile(findfile(filename))