Mass removal of deprecated constructs.

* Replace unittest.makeSuite with unittest.TestLoader().loadTestsFromTestCase
* import unittest from relative import

29 files changed, 78 insertions, 79 deletions

diff --git a/tests/test_aes.py b/tests/test_aes.py
index 1da122d..08858db 100644
--- a/tests/test_aes.py
+++ b/tests/test_aes.py
@@ -7,7 +7,7 @@ Copyright (c) 2018 Matej Cepl. All rights reserved.
 import logging
 
 from M2Crypto import m2
-from tests import unittest
+from . import unittest
 
 log = logging.getLogger('test_AES')
 
@@ -72,7 +72,7 @@ class AESTestCase(unittest.TestCase):
 
 def suite():
     t_suite = unittest.TestSuite()
-    t_suite.addTest(unittest.makeSuite(AESTestCase))
+    t_suite.addTest(unittest.TestLoader().loadTestsFromTestCase(AESTestCase))
     return t_suite
 
 
diff --git a/tests/test_asn1.py b/tests/test_asn1.py
index 0f5274f..95f7ea4 100644
--- a/tests/test_asn1.py
+++ b/tests/test_asn1.py
@@ -8,7 +8,7 @@ import datetime
 import time
 
 from M2Crypto import ASN1, m2
-from tests import unittest
+from . import unittest
 
 
 class ASN1TestCase(unittest.TestCase):
@@ -142,7 +142,7 @@ class ASN1TestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(ASN1TestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(ASN1TestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_authcookie.py b/tests/test_authcookie.py
index 006571f..0bd89f6 100755
--- a/tests/test_authcookie.py
+++ b/tests/test_authcookie.py
@@ -10,7 +10,7 @@ import time
 from M2Crypto import EVP, Rand, six, util
 from M2Crypto.AuthCookie import AuthCookie, AuthCookieJar, mix, unmix, unmix3
 from M2Crypto.six.moves.http_cookies import SimpleCookie  # pylint: disable=no-name-in-module,import-error
-from tests import unittest
+from . import unittest
 
 log = logging.getLogger(__name__)
 
@@ -162,7 +162,7 @@ class AuthCookieTestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(AuthCookieTestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(AuthCookieTestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_bio.py b/tests/test_bio.py
index d2b4fa4..89b2fc3 100644
--- a/tests/test_bio.py
+++ b/tests/test_bio.py
@@ -12,8 +12,8 @@ Author: Heikki Toivonen
 import logging
 
 from M2Crypto import BIO, Rand
-from tests import unittest
-from tests.fips import fips_mode
+from . import unittest
+from .fips import fips_mode
 
 log = logging.getLogger('test_bio')
 
@@ -84,9 +84,8 @@ class CipherStreamTestCase(unittest.TestCase):
 
 
 def suite():
-    t_suite = unittest.TestSuite()
-    t_suite.addTest(unittest.makeSuite(CipherStreamTestCase))
-    return t_suite
+    return unittest.TestLoader().loadTestsFromTestCase(CipherStreamTestCase)
+
 
 if __name__ == '__main__':
     Rand.load_file('randpool.dat', -1)
diff --git a/tests/test_bio_file.py b/tests/test_bio_file.py
index fe0a8a7..f10948f 100644
--- a/tests/test_bio_file.py
+++ b/tests/test_bio_file.py
@@ -13,7 +13,7 @@ if platform.system() == 'Windows':
     import ctypes.wintypes
 
 from M2Crypto.BIO import File, openfile
-from tests import unittest
+from . import unittest
 
 log = logging.getLogger(__name__)
 
@@ -137,7 +137,7 @@ class FileTestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(FileTestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(FileTestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_bio_iobuf.py b/tests/test_bio_iobuf.py
index 372fd04..9fc4181 100644
--- a/tests/test_bio_iobuf.py
+++ b/tests/test_bio_iobuf.py
@@ -7,7 +7,7 @@ Copyright (c) 2000 Ng Pheng Siong. All rights reserved."""
 from io import BytesIO
 
 from M2Crypto.BIO import IOBuffer, MemoryBuffer
-from tests import unittest
+from . import unittest
 
 
 class IOBufferTestCase(unittest.TestCase):
@@ -84,7 +84,7 @@ class IOBufferTestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(IOBufferTestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(IOBufferTestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_bio_membuf.py b/tests/test_bio_membuf.py
index 49a0e24..ebac7b7 100644
--- a/tests/test_bio_membuf.py
+++ b/tests/test_bio_membuf.py
@@ -8,7 +8,7 @@ import os
 import multiprocessing
 
 from M2Crypto.BIO import MemoryBuffer
-from tests import unittest
+from . import unittest
 
 
 class TimeLimitExpired(Exception):
@@ -110,7 +110,7 @@ def run_test(*args, **kwargs):
         assert mb.readlines() == [b'hello' + sep, b'world' + sep]
 
 def suite():
-    return unittest.makeSuite(MemoryBufferTestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(MemoryBufferTestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_bio_ssl.py b/tests/test_bio_ssl.py
index 1f9ae89..9b2b45e 100644
--- a/tests/test_bio_ssl.py
+++ b/tests/test_bio_ssl.py
@@ -15,7 +15,7 @@ from M2Crypto import Err
 from M2Crypto import Rand
 from M2Crypto import threading as m2threading
 
-from tests import unittest
+from . import unittest
 from tests.test_ssl import srv_host, allocate_srv_port
 
 
@@ -150,7 +150,7 @@ class SSLTestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(SSLTestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(SSLTestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_bn.py b/tests/test_bn.py
index 410969a..560bebd 100644
--- a/tests/test_bn.py
+++ b/tests/test_bn.py
@@ -10,7 +10,7 @@ import re
 import warnings
 
 from M2Crypto import BN, Rand
-from tests import unittest
+from . import unittest
 
 loops = 16
 
@@ -72,7 +72,7 @@ class BNTestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(BNTestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(BNTestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_dh.py b/tests/test_dh.py
index 074f154..d439cb4 100644
--- a/tests/test_dh.py
+++ b/tests/test_dh.py
@@ -5,7 +5,7 @@
 Copyright (c) 2000 Ng Pheng Siong. All rights reserved."""
 
 from M2Crypto import DH, BIO, Rand
-from tests import unittest
+from . import unittest
 
 
 class DHTestCase(unittest.TestCase):
@@ -59,7 +59,7 @@ class DHTestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(DHTestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(DHTestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_dsa.py b/tests/test_dsa.py
index a9a940a..140ce99 100644
--- a/tests/test_dsa.py
+++ b/tests/test_dsa.py
@@ -7,7 +7,7 @@ Copyright (c) 2000 Ng Pheng Siong. All rights reserved."""
 import hashlib
 
 from M2Crypto import DSA, Rand
-from tests import unittest
+from . import unittest
 
 
 class DSATestCase(unittest.TestCase):
@@ -112,7 +112,7 @@ class DSATestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(DSATestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(DSATestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_ec_curves.py b/tests/test_ec_curves.py
index c15dcec..3f36356 100644
--- a/tests/test_ec_curves.py
+++ b/tests/test_ec_curves.py
@@ -22,7 +22,7 @@ from __future__ import absolute_import
 import logging
 
 from M2Crypto import EC, Rand, m2  # noqa
-from tests import unittest
+from . import unittest
 
 log = logging.getLogger(__name__)
 
@@ -161,7 +161,7 @@ class ECCurveTests(unittest.TestCase):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(ECCurveTests))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(ECCurveTests))
     return suite
 
 
diff --git a/tests/test_ecdh.py b/tests/test_ecdh.py
index 0dc4600..dc92dae 100644
--- a/tests/test_ecdh.py
+++ b/tests/test_ecdh.py
@@ -9,7 +9,7 @@ rights reserved.
 
 from M2Crypto import EC, Rand
 
-from tests import unittest
+from . import unittest
 from tests.test_ec_curves import tested_curve
 
 
@@ -42,7 +42,7 @@ class ECDHTestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(ECDHTestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(ECDHTestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_ecdsa.py b/tests/test_ecdsa.py
index dea1209..7dfd044 100644
--- a/tests/test_ecdsa.py
+++ b/tests/test_ecdsa.py
@@ -11,7 +11,7 @@ import logging
 
 from M2Crypto import EC, Rand
 
-from tests import unittest
+from . import unittest
 from tests.test_ec_curves import tested_curve
 
 log = logging.getLogger(__name__)
@@ -87,7 +87,7 @@ class ECDSATestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(ECDSATestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(ECDSATestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_engine.py b/tests/test_engine.py
index 5439ee3..fd4ac2e 100644
--- a/tests/test_engine.py
+++ b/tests/test_engine.py
@@ -3,7 +3,7 @@
 """Unit tests for M2Crypto.Engine."""
 
 from M2Crypto import Engine
-from tests import unittest
+from . import unittest
 
 
 class EngineTestCase(unittest.TestCase):
@@ -53,7 +53,7 @@ class EngineTestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(EngineTestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(EngineTestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_err.py b/tests/test_err.py
index 05fe425..7ff0503 100644
--- a/tests/test_err.py
+++ b/tests/test_err.py
@@ -7,7 +7,7 @@ Released under the terms of MIT/X11 License,
 see the file LICENCE for more.
 """
 from M2Crypto import Err
-from tests import unittest
+from . import unittest
 
 
 class ErrTestCase(unittest.TestCase):
@@ -20,7 +20,7 @@ class ErrTestCase(unittest.TestCase):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(ErrTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(ErrTestCase))
     return suite
 
 
diff --git a/tests/test_evp.py b/tests/test_evp.py
index 7ef889e..7cc69db 100644
--- a/tests/test_evp.py
+++ b/tests/test_evp.py
@@ -15,7 +15,7 @@ import logging
 from binascii import a2b_hex, hexlify, unhexlify
 
 from M2Crypto import BIO, EVP, RSA, Rand, m2, util
-from tests import unittest
+from . import unittest
 from tests.fips import fips_mode
 
 log = logging.getLogger('test_EVP')
@@ -684,10 +684,10 @@ class HMACTestCase(unittest.TestCase):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(EVPTestCase))
-    suite.addTest(unittest.makeSuite(CipherTestCase))
-    suite.addTest(unittest.makeSuite(PBKDF2TestCase))
-    suite.addTest(unittest.makeSuite(HMACTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(EVPTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(CipherTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(PBKDF2TestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(HMACTestCase))
     return suite
 
 if __name__ == '__main__':
diff --git a/tests/test_obj.py b/tests/test_obj.py
index 7748492..55854c3 100644
--- a/tests/test_obj.py
+++ b/tests/test_obj.py
@@ -3,7 +3,7 @@
 """Unit tests for M2Crypto.m2 obj_* functions.
 """
 from M2Crypto import ASN1, BIO, Rand, X509, m2, six
-from tests import unittest
+from . import unittest
 
 """
 These functions must be cleaned up and moved to some python module
@@ -130,7 +130,7 @@ class ObjectsTestCase(unittest.TestCase):
 
 def suite():
     t_suite = unittest.TestSuite()
-    t_suite.addTest(unittest.makeSuite(ObjectsTestCase))
+    t_suite.addTest(unittest.TestLoader().loadTestsFromTestCase(ObjectsTestCase))
     return t_suite
 
 
diff --git a/tests/test_rand.py b/tests/test_rand.py
index cd27a25..765b1c8 100644
--- a/tests/test_rand.py
+++ b/tests/test_rand.py
@@ -11,7 +11,7 @@ import ctypes
 import warnings
 
 from M2Crypto import Rand, m2
-from tests import unittest
+from . import unittest
 
 
 class RandTestCase(unittest.TestCase):
@@ -76,7 +76,7 @@ class RandTestCase(unittest.TestCase):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(RandTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(RandTestCase))
     return suite
 
 
diff --git a/tests/test_rc4.py b/tests/test_rc4.py
index b06406c..6ef5266 100644
--- a/tests/test_rc4.py
+++ b/tests/test_rc4.py
@@ -8,7 +8,7 @@ Copyright (c) 2009 Heikki Toivonen. All rights reserved."""
 from M2Crypto import RC4, Rand
 from binascii import hexlify
 
-from tests import unittest
+from . import unittest
 from tests.fips import fips_mode
 
 
@@ -43,7 +43,7 @@ class RC4TestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(RC4TestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(RC4TestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_rsa.py b/tests/test_rsa.py
index a1d0805..21f7577 100644
--- a/tests/test_rsa.py
+++ b/tests/test_rsa.py
@@ -10,7 +10,7 @@ import logging
 import os
 
 from M2Crypto import BIO, RSA, Rand, X509, m2, six
-from tests import unittest
+from . import unittest
 from tests.fips import fips_mode
 
 log = logging.getLogger('test_RSA')
@@ -345,7 +345,7 @@ class RSATestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(RSATestCase)
+    return unittest.TestLoader().loadTestsFromTestCase(RSATestCase)
 
 
 if __name__ == '__main__':
diff --git a/tests/test_smime.py b/tests/test_smime.py
index a0edca8..e880bef 100644
--- a/tests/test_smime.py
+++ b/tests/test_smime.py
@@ -8,7 +8,7 @@ Copyright (C) 2006 Open Source Applications Foundation. All Rights Reserved.
 import os.path
 
 from M2Crypto import BIO, EVP, Rand, SMIME, X509
-from tests import unittest
+from . import unittest
 
 
 # Various callbacks to set by X509_Store.set_verify_cb() for
@@ -375,8 +375,8 @@ class WriteLoadTestCase(unittest.TestCase):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(SMIMETestCase))
-    suite.addTest(unittest.makeSuite(WriteLoadTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(SMIMETestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(WriteLoadTestCase))
     return suite
 
 
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index 3aa781f..92b6942 100644
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -34,7 +34,7 @@ import warnings
 from M2Crypto import (Err, Rand, SSL, X509, ftpslib, httpslib, m2, m2urllib,
                       m2urllib2, m2xmlrpclib, six)
 from M2Crypto.SSL.timeout import DEFAULT_TIMEOUT
-from tests import unittest
+from . import unittest
 from tests.fips import fips_mode
 
 log = logging.getLogger('test_SSL')
@@ -1209,20 +1209,20 @@ class FtpslibTestCase(unittest.TestCase):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(SessionTestCase))
-    suite.addTest(unittest.makeSuite(XmlRpcLibTestCase))
-    suite.addTest(unittest.makeSuite(FtpsLibTestCase))
-    suite.addTest(unittest.makeSuite(PassSSLClientTestCase))
-    suite.addTest(unittest.makeSuite(HttpslibSSLClientTestCase))
-    suite.addTest(unittest.makeSuite(HttpslibSSLSNIClientTestCase))
-    suite.addTest(unittest.makeSuite(UrllibSSLClientTestCase))
-    suite.addTest(unittest.makeSuite(Urllib2SSLClientTestCase))
-    suite.addTest(unittest.makeSuite(Urllib2TEChunkedSSLClientTestCase))
-    suite.addTest(unittest.makeSuite(MiscSSLClientTestCase))
-    suite.addTest(unittest.makeSuite(FtpslibTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(SessionTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(XmlRpcLibTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(FtpsLibTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(PassSSLClientTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(HttpslibSSLClientTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(HttpslibSSLSNIClientTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(UrllibSSLClientTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(Urllib2SSLClientTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(Urllib2TEChunkedSSLClientTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(MiscSSLClientTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(FtpslibTestCase))
     try:
         import M2Crypto.SSL.TwistedProtocolWrapper as wrapper  # noqa
-        suite.addTest(unittest.makeSuite(TwistedSSLClientTestCase))
+        suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TwistedSSLClientTestCase))
     except ImportError:
         pass
     return suite
diff --git a/tests/test_ssl_offline.py b/tests/test_ssl_offline.py
index 08e8d44..3ae99bf 100644
--- a/tests/test_ssl_offline.py
+++ b/tests/test_ssl_offline.py
@@ -10,7 +10,7 @@ Copyright (C) 2009-2010 Heikki Toivonen. All Rights Reserved.
 import doctest
 
 from M2Crypto import Rand, SSL, X509
-from tests import unittest
+from . import unittest
 from tests.test_ssl import srv_host
 
 
@@ -59,8 +59,8 @@ class ContextTestCase(unittest.TestCase):
 
 def suite():
     t_suite = unittest.TestSuite()
-    t_suite.addTest(unittest.makeSuite(CheckerTestCase))
-    t_suite.addTest(unittest.makeSuite(ContextTestCase))
+    t_suite.addTest(unittest.TestLoader().loadTestsFromTestCase(CheckerTestCase))
+    t_suite.addTest(unittest.TestLoader().loadTestsFromTestCase(ContextTestCase))
     return t_suite
 
 
diff --git a/tests/test_ssl_win.py b/tests/test_ssl_win.py
index 0095263..edd50be 100644
--- a/tests/test_ssl_win.py
+++ b/tests/test_ssl_win.py
@@ -59,7 +59,7 @@ if win32process:
             win32process.TerminateProcess(hproc, 0)
 
     def suite():
-        return unittest.makeSuite(SSLWinClientTestCase)
+        return unittest.TestLoader().loadTestsFromTestCase(SSLWinClientTestCase)
 
     def zap_servers():
         pass
diff --git a/tests/test_threading.py b/tests/test_threading.py
index ad1d111..ce646e2 100644
--- a/tests/test_threading.py
+++ b/tests/test_threading.py
@@ -5,7 +5,7 @@
 Copyright (C) 2007 Open Source Applications Foundation. All Rights Reserved.
 """
 from M2Crypto import threading as m2threading, Rand
-from tests import unittest
+from . import unittest
 
 
 class ThreadingTestCase(unittest.TestCase):
@@ -31,7 +31,7 @@ class ThreadingTestCase(unittest.TestCase):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(ThreadingTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(ThreadingTestCase))
     return suite
 
 
diff --git a/tests/test_timeout.py b/tests/test_timeout.py
index 6d05449..5d4564e 100644
--- a/tests/test_timeout.py
+++ b/tests/test_timeout.py
@@ -5,7 +5,7 @@
 
 import sys
 from M2Crypto.SSL import timeout, struct_to_timeout, struct_size
-from tests import unittest
+from . import unittest
 
 # Max value for sec argument on Windows:
 # - needs to fit DWORD (signed 32-bit) when converted to millisec
@@ -127,7 +127,7 @@ class TimeoutTestCase(unittest.TestCase):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TimeoutTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TimeoutTestCase))
     return suite
 
 
diff --git a/tests/test_util.py b/tests/test_util.py
index f4c758e..442630d 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -7,7 +7,7 @@ All Rights Reserved.
 """
 
 from M2Crypto import six
-from tests import unittest
+from . import unittest
 
 
 class UtilTestCase(unittest.TestCase):
@@ -40,7 +40,7 @@ class UtilTestCase(unittest.TestCase):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(UtilTestCase))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(UtilTestCase))
     return suite
 
 
diff --git a/tests/test_x509.py b/tests/test_x509.py
index 138af27..0b126f7 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -16,7 +16,7 @@ import time
 import warnings
 
 from M2Crypto import ASN1, BIO, EVP, RSA, Rand, X509, m2, six  # noqa
-from tests import unittest
+from . import unittest
 
 log = logging.getLogger(__name__)
 
@@ -697,10 +697,10 @@ class CRLTestCase(unittest.TestCase):
 
 def suite():
     st = unittest.TestSuite()
-    st.addTest(unittest.makeSuite(X509TestCase))
-    st.addTest(unittest.makeSuite(X509StackTestCase))
-    st.addTest(unittest.makeSuite(X509ExtTestCase))
-    st.addTest(unittest.makeSuite(CRLTestCase))
+    st.addTest(unittest.TestLoader().loadTestsFromTestCase(X509TestCase))
+    st.addTest(unittest.TestLoader().loadTestsFromTestCase(X509StackTestCase))
+    st.addTest(unittest.TestLoader().loadTestsFromTestCase(X509ExtTestCase))
+    st.addTest(unittest.TestLoader().loadTestsFromTestCase(CRLTestCase))
     return st