diff --git a/letsencrypt/acme/challenges_test.py b/letsencrypt/acme/challenges_test.py
index a2293d294..53b3ff3f1 100644
--- a/letsencrypt/acme/challenges_test.py
+++ b/letsencrypt/acme/challenges_test.py
@@ -4,7 +4,7 @@ import pkg_resources
 import unittest
 
 import Crypto.PublicKey.RSA
-import M2Crypto.X509
+import M2Crypto
 
 from letsencrypt.acme import errors
 from letsencrypt.acme import jose
diff --git a/letsencrypt/acme/messages_test.py b/letsencrypt/acme/messages_test.py
index 4662da1f7..ab9f4f64e 100644
--- a/letsencrypt/acme/messages_test.py
+++ b/letsencrypt/acme/messages_test.py
@@ -3,7 +3,7 @@ import pkg_resources
 import unittest
 
 import Crypto.PublicKey.RSA
-import M2Crypto.X509
+import M2Crypto
 
 from letsencrypt.acme import challenges
 from letsencrypt.acme import errors
diff --git a/letsencrypt/acme/util.py b/letsencrypt/acme/util.py
index ac7bf3874..0969ceb64 100644
--- a/letsencrypt/acme/util.py
+++ b/letsencrypt/acme/util.py
@@ -3,7 +3,7 @@ import binascii
 import json
 import pkg_resources
 
-import M2Crypto.X509
+import M2Crypto
 import zope.interface
 
 from letsencrypt.acme import errors
diff --git a/letsencrypt/acme/util_test.py b/letsencrypt/acme/util_test.py
index c64c5dfca..fddb24fc3 100644
--- a/letsencrypt/acme/util_test.py
+++ b/letsencrypt/acme/util_test.py
@@ -5,7 +5,7 @@ import os
 import pkg_resources
 import unittest
 
-import M2Crypto.X509
+import M2Crypto
 import zope.interface
 
 from letsencrypt.acme import errors