diff --git a/test-wallace.py b/test-wallace.py
--- a/test-wallace.py
+++ b/test-wallace.py
@@ -25,11 +25,18 @@
 # For development purposes
 sys.path.extend(['.', '..'])
 
-from email.MIMEMultipart import MIMEMultipart
-from email.MIMEBase import MIMEBase
-from email.MIMEText import MIMEText
-from email.Utils import COMMASPACE, formatdate
-from email import Encoders
+try:
+    from email.MIMEMultipart import MIMEMultipart
+    from email.MIMEBase import MIMEBase
+    from email.MIMEText import MIMEText
+    from email.Utils import COMMASPACE, formatdate
+    from email import Encoders
+except:
+    from email.mime.multipart import MIMEMultipart
+    from email.mime.base import MIMEBase
+    from email.mime.text import MIMEText
+    from email.utils import COMMASPACE, formatdate
+    import email.encoders as Encoders
 
 
 def send_mail(send_from, send_to, send_with=None):