diff --git a/setup.py b/setup.py
index 13589d9..e9ccb1d 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ import sys
 from sys import argv
 
 import os
-from os import environ, uname
+from os import environ
 from os.path import dirname, exists, join
 
 from setuptools import setup, Extension
diff --git a/test/basic_doctest.py b/test/basic_doctest.py
index c9ec96b..37f3e96 100644
--- a/test/basic_doctest.py
+++ b/test/basic_doctest.py
@@ -12,17 +12,8 @@ Bob Bourne <bob.bourne@peptest.ch>
 >>> m.to = [you]
 >>> m.shortmsg = "let's meet next week"
 >>> m.longmsg = "Please call me back"
->>> print(str(m).replace('\\r', ''))
-From: Alice Smith <alice.smith@peptest.ch>
-To: Bob Bourne <bob.bourne@peptest.ch>
-Subject: let's meet next week
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: quoted-printable
-Content-Disposition: inline; filename="msg.txt"
-<BLANKLINE>
-Please call me back
 >>> m2 = m.encrypt()
+>>> print(m2)
 >>> m3, keys, rating, flags = m2.decrypt()
 >>> rating
 pEp.PEP_rating.PEP_rating_reliable