diff --git a/source4/dsdb/tests/python/ad_dc_medley_performance.py b/source4/dsdb/tests/python/ad_dc_medley_performance.py
index 0a5641126be..39f9e67cd26 100644
--- a/source4/dsdb/tests/python/ad_dc_medley_performance.py
+++ b/source4/dsdb/tests/python/ad_dc_medley_performance.py
@@ -515,7 +515,8 @@ if "://" not in host:
 
 if ANCIENT_SAMBA:
     runner = SubunitTestRunner()
-    if not runner.run(unittest.makeSuite(UserTests)).wasSuccessful():
+    if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+            UserTests)).wasSuccessful():
         sys.exit(1)
     sys.exit(0)
 else:
diff --git a/source4/dsdb/tests/python/ad_dc_multi_bind.py b/source4/dsdb/tests/python/ad_dc_multi_bind.py
index 62ae9bcf47c..93a1c30956a 100644
--- a/source4/dsdb/tests/python/ad_dc_multi_bind.py
+++ b/source4/dsdb/tests/python/ad_dc_multi_bind.py
@@ -80,7 +80,8 @@ if "://" not in host:
 
 if ANCIENT_SAMBA:
     runner = SubunitTestRunner()
-    if not runner.run(unittest.makeSuite(UserTests)).wasSuccessful():
+    if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+            UserTests)).wasSuccessful():
         sys.exit(1)
     sys.exit(0)
 else:
diff --git a/source4/dsdb/tests/python/ad_dc_performance.py b/source4/dsdb/tests/python/ad_dc_performance.py
index 0f69d8e8efe..b8863b51b02 100644
--- a/source4/dsdb/tests/python/ad_dc_performance.py
+++ b/source4/dsdb/tests/python/ad_dc_performance.py
@@ -332,7 +332,8 @@ if "://" not in host:
 
 if ANCIENT_SAMBA:
     runner = SubunitTestRunner()
-    if not runner.run(unittest.makeSuite(UserTests)).wasSuccessful():
+    if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+            UserTests)).wasSuccessful():
         sys.exit(1)
     sys.exit(0)
 else:
diff --git a/source4/dsdb/tests/python/ad_dc_provision_performance.py b/source4/dsdb/tests/python/ad_dc_provision_performance.py
index 3531ced38a0..bfe922698ba 100644
--- a/source4/dsdb/tests/python/ad_dc_provision_performance.py
+++ b/source4/dsdb/tests/python/ad_dc_provision_performance.py
@@ -123,7 +123,8 @@ if "://" not in host:
 
 if ANCIENT_SAMBA:
     runner = SubunitTestRunner()
-    if not runner.run(unittest.makeSuite(UserTests)).wasSuccessful():
+    if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+            UserTests)).wasSuccessful():
         sys.exit(1)
     sys.exit(0)
 else:
diff --git a/source4/dsdb/tests/python/ad_dc_search_performance.py b/source4/dsdb/tests/python/ad_dc_search_performance.py
index ef0e89eed86..aabcc22c50e 100644
--- a/source4/dsdb/tests/python/ad_dc_search_performance.py
+++ b/source4/dsdb/tests/python/ad_dc_search_performance.py
@@ -288,7 +288,8 @@ if "://" not in host:
 
 if ANCIENT_SAMBA:
     runner = SubunitTestRunner()
-    if not runner.run(unittest.makeSuite(UserTests)).wasSuccessful():
+    if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+            UserTests)).wasSuccessful():
         sys.exit(1)
     sys.exit(0)
 else:
diff --git a/source4/dsdb/tests/python/ndr_pack_performance.py b/source4/dsdb/tests/python/ndr_pack_performance.py
index a608d1af1b8..5defacf19ec 100644
--- a/source4/dsdb/tests/python/ndr_pack_performance.py
+++ b/source4/dsdb/tests/python/ndr_pack_performance.py
@@ -214,7 +214,8 @@ if "://" not in host:
 
 if ANCIENT_SAMBA:
     runner = SubunitTestRunner()
-    if not runner.run(unittest.makeSuite(UserTests)).wasSuccessful():
+    if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+            UserTests)).wasSuccessful():
         sys.exit(1)
     sys.exit(0)
 else:
diff --git a/source4/dsdb/tests/python/priv_attrs.py b/source4/dsdb/tests/python/priv_attrs.py
index 330d4589a9b..5c9db730f61 100644
--- a/source4/dsdb/tests/python/priv_attrs.py
+++ b/source4/dsdb/tests/python/priv_attrs.py
@@ -386,6 +386,7 @@ class PrivAttrsTests(samba.tests.TestCase):
 
 runner = SubunitTestRunner()
 rc = 0
-if not runner.run(unittest.makeSuite(PrivAttrsTests)).wasSuccessful():
+if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+        PrivAttrsTests)).wasSuccessful():
     rc = 1
 sys.exit(rc)
diff --git a/source4/dsdb/tests/python/user_account_control.py b/source4/dsdb/tests/python/user_account_control.py
index af5b0e9ea99..edc0fa0dda3 100755
--- a/source4/dsdb/tests/python/user_account_control.py
+++ b/source4/dsdb/tests/python/user_account_control.py
@@ -1292,6 +1292,7 @@ class UserAccountControlTests(samba.tests.TestCase):
 
 runner = SubunitTestRunner()
 rc = 0
-if not runner.run(unittest.makeSuite(UserAccountControlTests)).wasSuccessful():
+if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+        UserAccountControlTests)).wasSuccessful():
     rc = 1
 sys.exit(rc)