diff --git a/test/test_crypto.py b/test/test_crypto.py
index 8bfb332..afe8831 100644
--- a/test/test_crypto.py
+++ b/test/test_crypto.py
@@ -47,13 +47,16 @@
         self.assertRaises(TypeError, key.generate_key, "foo", "bar")
         self.assertRaises(Error, key.generate_key, -1, 0)
 
-        # These are a bit magic.  -1 and 0 are caught by our explicit check
-        # before calling into OpenSSL.  OpenSSL seems to think 2 is an invalid
-        # number of bits for an RSA key, although it's perfectly happy with 1
-        # and 3.
         self.assertRaises(ValueError, key.generate_key, TYPE_RSA, -1)
         self.assertRaises(ValueError, key.generate_key, TYPE_RSA, 0)
-        self.assertRaises(Error, key.generate_key, TYPE_RSA, 2)
+
+        # XXX RSA generation for small values of bits is fairly buggy in a wide
+        # range of OpenSSL versions.  I need to figure out what the safe lower
+        # bound for a reasonable number of OpenSSL versions is and explicitly
+        # check for that in the wrapper.  The failure behavior is typically an
+        # infinite loop inside OpenSSL.
+
+        # self.assertRaises(Error, key.generate_key, TYPE_RSA, 2)
 
         # XXX DSA generation seems happy with any number of bits.  The DSS
         # says bits must be between 512 and 1024 inclusive.  OpenSSL's DSA