diff --git a/Lib/test/output/test_mimetools b/Lib/test/output/test_mimetools
new file mode 100644
index 00000000000..4f0ec703def
--- /dev/null
+++ b/Lib/test/output/test_mimetools
@@ -0,0 +1,5 @@
+test_mimetools
+7bit PASS
+8bit PASS
+base64 PASS
+quoted-printable PASS
diff --git a/Lib/test/test_mimetools.py b/Lib/test/test_mimetools.py
new file mode 100644
index 00000000000..4ee11a10f38
--- /dev/null
+++ b/Lib/test/test_mimetools.py
@@ -0,0 +1,18 @@
+from test_support import TestFailed
+import mimetools
+
+import string,StringIO
+start = string.letters + "=" + string.digits + "\n"
+for enc in ['7bit','8bit','base64','quoted-printable']:
+    print enc,
+    i = StringIO.StringIO(start)
+    o = StringIO.StringIO()
+    mimetools.encode(i,o,enc)
+    i = StringIO.StringIO(o.getvalue())
+    o = StringIO.StringIO()
+    mimetools.decode(i,o,enc)
+    if o.getvalue()==start:
+        print "PASS"
+    else:
+        print "FAIL"
+        print o.getvalue()