diff --git a/CHANGES b/CHANGES
index 9534aeb..32b1c7c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,7 @@ Changes since 2.5.1:
 Lib/
 
 Tests/
-* 
+* scripts do not directly call SlapdTestCase.setUpClass() anymore
 
 ----------------------------------------------------------------
 Released 2.5.1 2017-11-12
diff --git a/Tests/t_cext.py b/Tests/t_cext.py
index 6add784..e1d79d3 100644
--- a/Tests/t_cext.py
+++ b/Tests/t_cext.py
@@ -26,7 +26,7 @@ class TestLdapCExtension(SlapdTestCase):
 
     @classmethod
     def setUpClass(cls):
-        SlapdTestCase.setUpClass()
+        super(TestLdapCExtension, cls).setUpClass()
         # add two initial objects after server was started and is still empty
         suffix_dc = cls.server.suffix.split(',')[0][3:]
         cls.server._log.debug(
diff --git a/Tests/t_ldapobject.py b/Tests/t_ldapobject.py
index e03ca1e..af83e46 100644
--- a/Tests/t_ldapobject.py
+++ b/Tests/t_ldapobject.py
@@ -65,7 +65,7 @@ class Test01_SimpleLDAPObject(SlapdTestCase):
 
     @classmethod
     def setUpClass(cls):
-        SlapdTestCase.setUpClass()
+        super(Test01_SimpleLDAPObject, cls).setUpClass()
         # insert some Foo* objects via ldapadd
         cls.server.ldapadd(
             LDIF_TEMPLATE % {