diff --git a/test/test_crypto.py b/test/test_crypto.py
index d9317fd..6d88ec1 100644
--- a/test/test_crypto.py
+++ b/test/test_crypto.py
@@ -194,6 +194,7 @@
         self.assertEqual(type(X509ExtensionType).__name__, 'type')
         self.assertEqual(type(basic).__name__, 'X509Extension')
         self.assertEqual(type(basic), X509ExtensionType)
+        self.assertEqual(type(basic), X509Extension)
 
 
     def test_invalid_extension(self):
@@ -254,6 +255,7 @@
         self.assertEqual(type(PKeyType).__name__, 'type')
         self.assertEqual(type(key).__name__, 'PKey')
         self.assertEqual(type(key), PKeyType)
+        self.assertEqual(type(key), PKey)
 
 
     def test_pregeneration(self):
@@ -369,6 +371,7 @@
         self.assertEqual(type(X509NameType).__name__, 'type')
         self.assertEqual(type(name).__name__, 'X509Name')
         self.assertEqual(type(name), X509NameType)
+        self.assertEqual(type(name), X509Name)
 
 
     def test_attributes(self):
@@ -583,6 +586,7 @@
         self.assertEqual(type(X509ReqType).__name__, 'type')
         self.assertEqual(type(req).__name__, 'X509Req')
         self.assertEqual(type(req), X509ReqType)
+        self.assertEqual(type(req), X509Req)
         return req
 
 
@@ -655,6 +659,7 @@
         self.assertEqual(type(X509Type).__name__, 'type')
         self.assertEqual(type(certificate).__name__, 'X509')
         self.assertEqual(type(certificate), X509Type)
+        self.assertEqual(type(certificate), X509)
 
 
     def test_serial_number(self):
@@ -926,6 +931,7 @@
         self.assertEqual(type(PKCS7Type).__name__, 'type')
         self.assertEqual(type(pkcs7).__name__, 'PKCS7')
         self.assertEqual(type(pkcs7), PKCS7Type)
+        #self.assertEqual(type(pkcs7), PKCS7)  # needs to be fixed
 
 
     def test_load_pkcs12(self):
@@ -938,6 +944,7 @@
         self.assertEqual(type(PKCS12Type).__name__, 'type')
         self.assertEqual(type(pkcs12).__name__, 'PKCS12')
         self.assertEqual(type(pkcs12), PKCS12Type)
+        #self.assertEqual(type(pkcs12), PKCS12)  # needs to be fixed
 
 
 
@@ -954,6 +961,7 @@
         self.assertEqual(type(NetscapeSPKIType).__name__, 'type')
         self.assertEqual(type(nspki).__name__, 'NetscapeSPKI')
         self.assertEqual(type(nspki), NetscapeSPKIType)
+        self.assertEqual(type(nspki), NetscapeSPKI)
 
 
 
diff --git a/test/test_ssl.py b/test/test_ssl.py
index 831af1a..1b4e3b7 100644
--- a/test/test_ssl.py
+++ b/test/test_ssl.py
@@ -55,6 +55,7 @@
         self.assertEqual(type(ContextType).__name__, 'type')
         self.assertEqual(type(ctx).__name__, 'Context')
         self.assertEqual(type(ctx), ContextType)
+        self.assertEqual(type(ctx), Context)
 
 
     def test_use_privatekey(self):
@@ -284,6 +285,7 @@
         self.assertEqual(type(ConnectionType).__name__, 'type')
         self.assertEqual(type(conn).__name__, 'Connection')
         self.assertEqual(type(conn), ConnectionType)
+        self.assertEqual(type(conn), Connection)
 
         self.assertEqual(Error.__name__, 'Error')
         self.assertEqual(type(Error).__name__, 'type')