From 3bf8c3228b9a5118f16760f36d59e3db76c032ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 15 Aug 2024 13:55:35 +0200
Subject: [PATCH] Version 3.10.0

... (rhbz#2305077)
---
 424784895b0f.patch |   26 -
 4a1b480e7e37.patch | 2051 --------------------------------------------
 python-tables.spec |    7 +-
 sources            |    2 +-
 4 files changed, 3 insertions(+), 2083 deletions(-)
 delete mode 100644 424784895b0f.patch
 delete mode 100644 4a1b480e7e37.patch

diff --git a/424784895b0f.patch b/424784895b0f.patch
deleted file mode 100644
index 7ceccef..0000000
--- a/424784895b0f.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 424784895b0fb15ad06707ce60f9829cef4f11e2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Mon, 3 Jun 2024 17:21:38 +0200
-Subject: [PATCH] Make tables.tests.common.make_suite() accept the prefix
- argument
-
-...as test_queries.py uses it.
----
- tables/tests/common.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/tables/tests/common.py b/tables/tests/common.py
-index 918b17247..1d2e5feab 100644
---- a/tables/tests/common.py
-+++ b/tables/tests/common.py
-@@ -371,5 +371,8 @@ def test00(self):
- try:
-     from unittest import makeSuite as make_suite
- except ImportError:
--    def make_suite(test_case_class):
--        return unittest.TestLoader().loadTestsFromTestCase(test_case_class)
-+    def make_suite(test_case_class, *, prefix=None):
-+        loader = unittest.TestLoader()
-+        if prefix:
-+            loader.testMethodPrefix = prefix
-+        return loader.loadTestsFromTestCase(test_case_class)
diff --git a/4a1b480e7e37.patch b/4a1b480e7e37.patch
deleted file mode 100644
index 183c28a..0000000
--- a/4a1b480e7e37.patch
+++ /dev/null
@@ -1,2051 +0,0 @@
-From 4a1b480e7e3758cf2cf06354ec5720020db16ce7 Mon Sep 17 00:00:00 2001
-From: Antonio Valentino <antonio.valentino@tiscali.it>
-Date: Sun, 19 May 2024 17:39:47 +0200
-Subject: [PATCH] Fix compatibility with Python v3.13 (Closes: #1166)
-
-The unittest.makeSuite function is not available in Python 3.13.
----
- bench/widetree.py                     |   2 +-
- bench/widetree2.py                    |   2 +-
- tables/nodes/tests/test_filenode.py   |  24 +--
- tables/tests/common.py                |   7 +
- tables/tests/test_array.py            | 116 +++++++--------
- tables/tests/test_attributes.py       |  42 +++---
- tables/tests/test_aux.py              |   3 +-
- tables/tests/test_backcompat.py       |  18 +--
- tables/tests/test_basics.py           |  38 ++---
- tables/tests/test_carray.py           | 206 +++++++++++++-------------
- tables/tests/test_create.py           | 108 +++++++-------
- tables/tests/test_do_undo.py          |  24 +--
- tables/tests/test_earray.py           | 152 +++++++++----------
- tables/tests/test_enum.py             |  12 +-
- tables/tests/test_expression.py       |  98 ++++++------
- tables/tests/test_garbage.py          |   2 +-
- tables/tests/test_hdf5compat.py       |  32 ++--
- tables/tests/test_index_backcompat.py |   4 +-
- tables/tests/test_indexes.py          |  74 ++++-----
- tables/tests/test_indexvalues.py      |  10 +-
- tables/tests/test_large_tables.py     |   6 +-
- tables/tests/test_links.py            |   6 +-
- tables/tests/test_lists.py            |  24 +--
- tables/tests/test_nestedtypes.py      |  22 +--
- tables/tests/test_numpy.py            |  38 ++---
- tables/tests/test_queries.py          |  70 ++++-----
- tables/tests/test_suite.py            |   4 +-
- tables/tests/test_tables.py           | 188 +++++++++++------------
- tables/tests/test_tablesMD.py         |  58 ++++----
- tables/tests/test_timestamps.py       |   4 +-
- tables/tests/test_timetype.py         |  10 +-
- tables/tests/test_tree.py             |  10 +-
- tables/tests/test_types.py            |   8 +-
- tables/tests/test_utils.py            |   6 +-
- tables/tests/test_vlarray.py          |  96 ++++++------
- 35 files changed, 766 insertions(+), 758 deletions(-)
-
-diff --git a/bench/widetree.py b/bench/widetree.py
-index 707c23deb..80c878b15 100644
---- a/bench/widetree.py
-+++ b/bench/widetree.py
-@@ -110,7 +110,7 @@ def test01_wideTree(self):
- 
- def suite():
-     theSuite = unittest.TestSuite()
--    theSuite.addTest(unittest.makeSuite(WideTreeTestCase))
-+    theSuite.addTest(make_suite(WideTreeTestCase))
- 
-     return theSuite
- 
-diff --git a/bench/widetree2.py b/bench/widetree2.py
-index 9ad00e328..f1c5dd3eb 100644
---- a/bench/widetree2.py
-+++ b/bench/widetree2.py
-@@ -103,7 +103,7 @@ def test00_Leafs(self):
- #----------------------------------------------------------------------
- def suite():
-     theSuite = unittest.TestSuite()
--    theSuite.addTest(unittest.makeSuite(WideTreeTestCase))
-+    theSuite.addTest(make_suite(WideTreeTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/nodes/tests/test_filenode.py b/tables/nodes/tests/test_filenode.py
-index c2754218a..3572cc38f 100644
---- a/tables/nodes/tests/test_filenode.py
-+++ b/tables/nodes/tests/test_filenode.py
-@@ -9,7 +9,7 @@
- from ... import open_file, file, NoSuchNodeError
- from ...nodes import filenode
- from ...tests.common import (
--    unittest, TempFileMixin, parse_argv, print_versions,
-+    unittest, TempFileMixin, parse_argv, print_versions, make_suite,
-     PyTablesTestCase as TestCase)
- 
- 
-@@ -1018,17 +1018,17 @@ def suite():
- 
-     theSuite = unittest.TestSuite()
- 
--    theSuite.addTest(unittest.makeSuite(NewFileTestCase))
--    theSuite.addTest(unittest.makeSuite(ClosedFileTestCase))
--    theSuite.addTest(unittest.makeSuite(WriteFileTestCase))
--    theSuite.addTest(unittest.makeSuite(OpenFileTestCase))
--    theSuite.addTest(unittest.makeSuite(ReadFileTestCase))
--    theSuite.addTest(unittest.makeSuite(MonoReadlineTestCase))
--    # theSuite.addTest(unittest.makeSuite(MultiReadlineTestCase))
--    # theSuite.addTest(unittest.makeSuite(LineSeparatorTestCase))
--    theSuite.addTest(unittest.makeSuite(AttrsTestCase))
--    theSuite.addTest(unittest.makeSuite(ClosedH5FileTestCase))
--    theSuite.addTest(unittest.makeSuite(DirectReadWriteTestCase))
-+    theSuite.addTest(make_suite(NewFileTestCase))
-+    theSuite.addTest(make_suite(ClosedFileTestCase))
-+    theSuite.addTest(make_suite(WriteFileTestCase))
-+    theSuite.addTest(make_suite(OpenFileTestCase))
-+    theSuite.addTest(make_suite(ReadFileTestCase))
-+    theSuite.addTest(make_suite(MonoReadlineTestCase))
-+    # theSuite.addTest(make_suite(MultiReadlineTestCase))
-+    # theSuite.addTest(make_suite(LineSeparatorTestCase))
-+    theSuite.addTest(make_suite(AttrsTestCase))
-+    theSuite.addTest(make_suite(ClosedH5FileTestCase))
-+    theSuite.addTest(make_suite(DirectReadWriteTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/common.py b/tables/tests/common.py
-index 31378a880..918b17247 100644
---- a/tables/tests/common.py
-+++ b/tables/tests/common.py
-@@ -366,3 +366,10 @@ def test00(self):
-         print(f"VmSize: {vmsize:>7} kB\tVmRSS: {vmrss:>7} kB")
-         print(f"VmData: {vmdata:>7} kB\tVmStk: {vmstk:>7} kB")
-         print(f"VmExe:  {vmexe:>7} kB\tVmLib: {vmlib:>7} kB")
-+
-+
-+try:
-+    from unittest import makeSuite as make_suite
-+except ImportError:
-+    def make_suite(test_case_class):
-+        return unittest.TestLoader().loadTestsFromTestCase(test_case_class)
-diff --git a/tables/tests/test_array.py b/tables/tests/test_array.py
-index 623cd9f29..aec437e17 100644
---- a/tables/tests/test_array.py
-+++ b/tables/tests/test_array.py
-@@ -2658,70 +2658,70 @@ def suite():
- 
-     for i in range(niter):
-         # The scalar case test should be refined in order to work
--        theSuite.addTest(common.unittest.makeSuite(Basic0DOneTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic0DTwoTestCase))
--        # theSuite.addTest(unittest.makeSuite(Basic1DZeroTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic1DOneTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic1DTwoTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic1DThreeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic2DOneTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic2DTwoTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic10DTestCase))
-+        theSuite.addTest(common.make_suite(Basic0DOneTestCase))
-+        theSuite.addTest(common.make_suite(Basic0DTwoTestCase))
-+        # theSuite.addTest(make_suite(Basic1DZeroTestCase))
-+        theSuite.addTest(common.make_suite(Basic1DOneTestCase))
-+        theSuite.addTest(common.make_suite(Basic1DTwoTestCase))
-+        theSuite.addTest(common.make_suite(Basic1DThreeTestCase))
-+        theSuite.addTest(common.make_suite(Basic2DOneTestCase))
-+        theSuite.addTest(common.make_suite(Basic2DTwoTestCase))
-+        theSuite.addTest(common.make_suite(Basic10DTestCase))
-         # The 32 dimensions case is tested on GroupsArray
--        # theSuite.addTest(unittest.makeSuite(Basic32DTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ReadOutArgumentTests))
--        theSuite.addTest(common.unittest.makeSuite(
-+        # theSuite.addTest(make_suite(Basic32DTestCase))
-+        theSuite.addTest(common.make_suite(ReadOutArgumentTests))
-+        theSuite.addTest(common.make_suite(
-             SizeOnDiskInMemoryPropertyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GroupsArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(GroupsArrayTestCase))
-+        theSuite.addTest(common.make_suite(
-             ComplexNotReopenNotEndianTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(
-             ComplexReopenNotEndianTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(
-             ComplexNotReopenEndianTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(
-             ComplexReopenEndianTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CloseCopyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(OpenCopyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex1TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex2TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex3TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex4TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex5TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex6TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex7TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex8TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex9TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex10TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex11TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex12TestCase))
--        theSuite.addTest(common.unittest.makeSuite(GI1NAOpenTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GI1NACloseTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GI2NAOpenTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GI2NACloseTestCase))
--        theSuite.addTest(common.unittest.makeSuite(SI1NAOpenTestCase))
--        theSuite.addTest(common.unittest.makeSuite(SI1NACloseTestCase))
--        theSuite.addTest(common.unittest.makeSuite(SI2NAOpenTestCase))
--        theSuite.addTest(common.unittest.makeSuite(SI2NACloseTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GE1NAOpenTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GE1NACloseTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GE2NAOpenTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GE2NACloseTestCase))
--        theSuite.addTest(common.unittest.makeSuite(NonHomogeneousTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TruncateTestCase))
--        theSuite.addTest(common.unittest.makeSuite(FancySelection1))
--        theSuite.addTest(common.unittest.makeSuite(FancySelection2))
--        theSuite.addTest(common.unittest.makeSuite(FancySelection3))
--        theSuite.addTest(common.unittest.makeSuite(FancySelection4))
--        theSuite.addTest(common.unittest.makeSuite(PointSelection0))
--        theSuite.addTest(common.unittest.makeSuite(PointSelection1))
--        theSuite.addTest(common.unittest.makeSuite(PointSelection2))
--        theSuite.addTest(common.unittest.makeSuite(PointSelection3))
--        theSuite.addTest(common.unittest.makeSuite(PointSelection4))
--        theSuite.addTest(common.unittest.makeSuite(CopyNativeHDF5MDAtom))
--        theSuite.addTest(common.unittest.makeSuite(AccessClosedTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TestCreateArrayArgs))
--        theSuite.addTest(common.unittest.makeSuite(BroadcastTest))
-+        theSuite.addTest(common.make_suite(CloseCopyTestCase))
-+        theSuite.addTest(common.make_suite(OpenCopyTestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex1TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex2TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex3TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex4TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex5TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex6TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex7TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex8TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex9TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex10TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex11TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex12TestCase))
-+        theSuite.addTest(common.make_suite(GI1NAOpenTestCase))
-+        theSuite.addTest(common.make_suite(GI1NACloseTestCase))
-+        theSuite.addTest(common.make_suite(GI2NAOpenTestCase))
-+        theSuite.addTest(common.make_suite(GI2NACloseTestCase))
-+        theSuite.addTest(common.make_suite(SI1NAOpenTestCase))
-+        theSuite.addTest(common.make_suite(SI1NACloseTestCase))
-+        theSuite.addTest(common.make_suite(SI2NAOpenTestCase))
-+        theSuite.addTest(common.make_suite(SI2NACloseTestCase))
-+        theSuite.addTest(common.make_suite(GE1NAOpenTestCase))
-+        theSuite.addTest(common.make_suite(GE1NACloseTestCase))
-+        theSuite.addTest(common.make_suite(GE2NAOpenTestCase))
-+        theSuite.addTest(common.make_suite(GE2NACloseTestCase))
-+        theSuite.addTest(common.make_suite(NonHomogeneousTestCase))
-+        theSuite.addTest(common.make_suite(TruncateTestCase))
-+        theSuite.addTest(common.make_suite(FancySelection1))
-+        theSuite.addTest(common.make_suite(FancySelection2))
-+        theSuite.addTest(common.make_suite(FancySelection3))
-+        theSuite.addTest(common.make_suite(FancySelection4))
-+        theSuite.addTest(common.make_suite(PointSelection0))
-+        theSuite.addTest(common.make_suite(PointSelection1))
-+        theSuite.addTest(common.make_suite(PointSelection2))
-+        theSuite.addTest(common.make_suite(PointSelection3))
-+        theSuite.addTest(common.make_suite(PointSelection4))
-+        theSuite.addTest(common.make_suite(CopyNativeHDF5MDAtom))
-+        theSuite.addTest(common.make_suite(AccessClosedTestCase))
-+        theSuite.addTest(common.make_suite(TestCreateArrayArgs))
-+        theSuite.addTest(common.make_suite(BroadcastTest))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_attributes.py b/tables/tests/test_attributes.py
-index bfc19c805..e65375321 100644
---- a/tables/tests/test_attributes.py
-+++ b/tables/tests/test_attributes.py
-@@ -1855,32 +1855,32 @@ def suite():
-     niter = 1
- 
-     for i in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(NotCloseCreate))
--        theSuite.addTest(common.unittest.makeSuite(CloseCreate))
--        theSuite.addTest(common.unittest.makeSuite(NoCacheNotCloseCreate))
--        theSuite.addTest(common.unittest.makeSuite(NoCacheCloseCreate))
--        theSuite.addTest(common.unittest.makeSuite(DictCacheNotCloseCreate))
--        theSuite.addTest(common.unittest.makeSuite(DictCacheCloseCreate))
--        theSuite.addTest(common.unittest.makeSuite(NotCloseTypesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CloseTypesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(NotCloseCreate))
-+        theSuite.addTest(common.make_suite(CloseCreate))
-+        theSuite.addTest(common.make_suite(NoCacheNotCloseCreate))
-+        theSuite.addTest(common.make_suite(NoCacheCloseCreate))
-+        theSuite.addTest(common.make_suite(DictCacheNotCloseCreate))
-+        theSuite.addTest(common.make_suite(DictCacheCloseCreate))
-+        theSuite.addTest(common.make_suite(NotCloseTypesTestCase))
-+        theSuite.addTest(common.make_suite(CloseTypesTestCase))
-+        theSuite.addTest(common.make_suite(
-             CloseNotAlignedPaddedTypesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(
-             NoCloseAlignedTypesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CloseAlignedTypesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(CloseAlignedTypesTestCase))
-+        theSuite.addTest(common.make_suite(
-             CloseAlignedPaddedTypesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(NoSysAttrsNotClose))
--        theSuite.addTest(common.unittest.makeSuite(NoSysAttrsClose))
--        theSuite.addTest(common.unittest.makeSuite(CompatibilityTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(NoSysAttrsNotClose))
-+        theSuite.addTest(common.make_suite(NoSysAttrsClose))
-+        theSuite.addTest(common.make_suite(CompatibilityTestCase))
-+        theSuite.addTest(common.make_suite(
-             PicklePy2UnpicklePy3TestCase))
--        theSuite.addTest(common.unittest.makeSuite(SegFaultPythonTestCase))
--        theSuite.addTest(common.unittest.makeSuite(EmbeddedNullsTestCase))
--        theSuite.addTest(common.unittest.makeSuite(VlenStrAttrTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(SegFaultPythonTestCase))
-+        theSuite.addTest(common.make_suite(EmbeddedNullsTestCase))
-+        theSuite.addTest(common.make_suite(VlenStrAttrTestCase))
-+        theSuite.addTest(common.make_suite(
-             UnsupportedAttrTypeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(SpecificAttrsTestCase))
-+        theSuite.addTest(common.make_suite(SpecificAttrsTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_aux.py b/tables/tests/test_aux.py
-index 95f34ee16..cf4f022de 100644
---- a/tables/tests/test_aux.py
-+++ b/tables/tests/test_aux.py
-@@ -2,6 +2,7 @@
- import numpy as np
- 
- import tables as tb
-+from tables.tests import common
- 
- 
- class TestAuxiliaryFunctions(unittest.TestCase):
-@@ -25,7 +26,7 @@ def test_keysort(self):
- 
- def suite():
-     theSuite = unittest.TestSuite()
--    theSuite.addTest(unittest.makeSuite(TestAuxiliaryFunctions))
-+    theSuite.addTest(common.make_suite(TestAuxiliaryFunctions))
-     return theSuite
- 
- 
-diff --git a/tables/tests/test_backcompat.py b/tables/tests/test_backcompat.py
-index c2e20ca14..5f45b19f1 100644
---- a/tables/tests/test_backcompat.py
-+++ b/tables/tests/test_backcompat.py
-@@ -203,15 +203,15 @@ def suite():
-     niter = 1
- 
-     for n in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(VLArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TimeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(OldFlavorsTestCase01))
--        theSuite.addTest(common.unittest.makeSuite(OldFlavorsTestCase02))
--        theSuite.addTest(common.unittest.makeSuite(Table2_1LZO))
--        theSuite.addTest(common.unittest.makeSuite(Tables_LZO1))
--        theSuite.addTest(common.unittest.makeSuite(Tables_LZO1_shuffle))
--        theSuite.addTest(common.unittest.makeSuite(Tables_LZO2))
--        theSuite.addTest(common.unittest.makeSuite(Tables_LZO2_shuffle))
-+        theSuite.addTest(common.make_suite(VLArrayTestCase))
-+        theSuite.addTest(common.make_suite(TimeTestCase))
-+        theSuite.addTest(common.make_suite(OldFlavorsTestCase01))
-+        theSuite.addTest(common.make_suite(OldFlavorsTestCase02))
-+        theSuite.addTest(common.make_suite(Table2_1LZO))
-+        theSuite.addTest(common.make_suite(Tables_LZO1))
-+        theSuite.addTest(common.make_suite(Tables_LZO1_shuffle))
-+        theSuite.addTest(common.make_suite(Tables_LZO2))
-+        theSuite.addTest(common.make_suite(Tables_LZO2_shuffle))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_basics.py b/tables/tests/test_basics.py
-index fa3e01b65..bec389bd8 100644
---- a/tables/tests/test_basics.py
-+++ b/tables/tests/test_basics.py
-@@ -2494,25 +2494,25 @@ def suite():
-     niter = 1
- 
-     for i in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(OpenFileFailureTestCase))
--        theSuite.addTest(common.unittest.makeSuite(NodeCacheOpenFile))
--        theSuite.addTest(common.unittest.makeSuite(NoNodeCacheOpenFile))
--        theSuite.addTest(common.unittest.makeSuite(DictNodeCacheOpenFile))
--        theSuite.addTest(common.unittest.makeSuite(CheckFileTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ThreadingTestCase))
--        theSuite.addTest(common.unittest.makeSuite(PythonAttrsTestCase))
--        theSuite.addTest(common.unittest.makeSuite(StateTestCase))
--        theSuite.addTest(common.unittest.makeSuite(FlavorTestCase))
--        theSuite.addTest(common.unittest.makeSuite(UnicodeFilename))
--        theSuite.addTest(common.unittest.makeSuite(PathLikeFilename))
--        theSuite.addTest(common.unittest.makeSuite(FilePropertyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscBigEndian))
--        theSuite.addTest(common.unittest.makeSuite(BloscSubprocess))
--        theSuite.addTest(common.unittest.makeSuite(HDF5ErrorHandling))
--        theSuite.addTest(common.unittest.makeSuite(TestDescription))
--        theSuite.addTest(common.unittest.makeSuite(TestAtom))
--        theSuite.addTest(common.unittest.makeSuite(TestCol))
--        theSuite.addTest(common.unittest.makeSuite(TestSysattrCompatibility))
-+        theSuite.addTest(common.make_suite(OpenFileFailureTestCase))
-+        theSuite.addTest(common.make_suite(NodeCacheOpenFile))
-+        theSuite.addTest(common.make_suite(NoNodeCacheOpenFile))
-+        theSuite.addTest(common.make_suite(DictNodeCacheOpenFile))
-+        theSuite.addTest(common.make_suite(CheckFileTestCase))
-+        theSuite.addTest(common.make_suite(ThreadingTestCase))
-+        theSuite.addTest(common.make_suite(PythonAttrsTestCase))
-+        theSuite.addTest(common.make_suite(StateTestCase))
-+        theSuite.addTest(common.make_suite(FlavorTestCase))
-+        theSuite.addTest(common.make_suite(UnicodeFilename))
-+        theSuite.addTest(common.make_suite(PathLikeFilename))
-+        theSuite.addTest(common.make_suite(FilePropertyTestCase))
-+        theSuite.addTest(common.make_suite(BloscBigEndian))
-+        theSuite.addTest(common.make_suite(BloscSubprocess))
-+        theSuite.addTest(common.make_suite(HDF5ErrorHandling))
-+        theSuite.addTest(common.make_suite(TestDescription))
-+        theSuite.addTest(common.make_suite(TestAtom))
-+        theSuite.addTest(common.make_suite(TestCol))
-+        theSuite.addTest(common.make_suite(TestSysattrCompatibility))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_carray.py b/tables/tests/test_carray.py
-index 4dd698aba..0ae73a0b0 100644
---- a/tables/tests/test_carray.py
-+++ b/tables/tests/test_carray.py
-@@ -2903,112 +2903,112 @@ def suite():
-     niter = 1
-     # common.heavy = 1  # uncomment this only for testing purposes
- 
--    # theSuite.addTest(unittest.makeSuite(BasicTestCase))
-+    # theSuite.addTest(make_suite(BasicTestCase))
-     for n in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(BasicWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BasicWrite2TestCase))
--        theSuite.addTest(common.unittest.makeSuite(BasicWrite3TestCase))
--        theSuite.addTest(common.unittest.makeSuite(BasicWrite4TestCase))
--        theSuite.addTest(common.unittest.makeSuite(BasicWrite5TestCase))
--        theSuite.addTest(common.unittest.makeSuite(BasicWrite6TestCase))
--        theSuite.addTest(common.unittest.makeSuite(BasicWrite7TestCase))
--        theSuite.addTest(common.unittest.makeSuite(BasicWrite8TestCase))
--        theSuite.addTest(common.unittest.makeSuite(EmptyCArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(EmptyCArray2TestCase))
--        theSuite.addTest(common.unittest.makeSuite(SlicesCArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Slices2CArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(EllipsisCArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Ellipsis2CArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Ellipsis3CArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ZlibComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ZlibShuffleTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscShuffleTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscBitShuffleTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscFletcherTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscBloscLZTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscLZ4TestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscLZ4HCTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscSnappyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscZlibTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscZstdTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2ComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2CrossChunkTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2CrossChunkOptTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2PastLastChunkTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2PastLastChunkOptTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2Ndim3MinChunkOptTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2Ndim3ChunkOptTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2Ndim4ChunkOptTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2NDNoChunkshape))
--        theSuite.addTest(common.unittest.makeSuite(LZOComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(LZOShuffleTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Bzip2ComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Bzip2ShuffleTestCase))
--        theSuite.addTest(common.unittest.makeSuite(FloatTypeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ComplexTypeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(StringTestCase))
--        theSuite.addTest(common.unittest.makeSuite(String2TestCase))
--        theSuite.addTest(common.unittest.makeSuite(StringComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Int8TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Int16TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Int32TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Float16TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Float32TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Float64TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Float96TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Float128TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Complex64TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Complex128TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Complex192TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Complex256TestCase))
--        theSuite.addTest(common.unittest.makeSuite(ComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(OffsetStrideTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Fletcher32TestCase))
--        theSuite.addTest(common.unittest.makeSuite(AllFiltersTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ReadOutArgumentTests))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(BasicWriteTestCase))
-+        theSuite.addTest(common.make_suite(BasicWrite2TestCase))
-+        theSuite.addTest(common.make_suite(BasicWrite3TestCase))
-+        theSuite.addTest(common.make_suite(BasicWrite4TestCase))
-+        theSuite.addTest(common.make_suite(BasicWrite5TestCase))
-+        theSuite.addTest(common.make_suite(BasicWrite6TestCase))
-+        theSuite.addTest(common.make_suite(BasicWrite7TestCase))
-+        theSuite.addTest(common.make_suite(BasicWrite8TestCase))
-+        theSuite.addTest(common.make_suite(EmptyCArrayTestCase))
-+        theSuite.addTest(common.make_suite(EmptyCArray2TestCase))
-+        theSuite.addTest(common.make_suite(SlicesCArrayTestCase))
-+        theSuite.addTest(common.make_suite(Slices2CArrayTestCase))
-+        theSuite.addTest(common.make_suite(EllipsisCArrayTestCase))
-+        theSuite.addTest(common.make_suite(Ellipsis2CArrayTestCase))
-+        theSuite.addTest(common.make_suite(Ellipsis3CArrayTestCase))
-+        theSuite.addTest(common.make_suite(ZlibComprTestCase))
-+        theSuite.addTest(common.make_suite(ZlibShuffleTestCase))
-+        theSuite.addTest(common.make_suite(BloscComprTestCase))
-+        theSuite.addTest(common.make_suite(BloscShuffleTestCase))
-+        theSuite.addTest(common.make_suite(BloscBitShuffleTestCase))
-+        theSuite.addTest(common.make_suite(BloscFletcherTestCase))
-+        theSuite.addTest(common.make_suite(BloscBloscLZTestCase))
-+        theSuite.addTest(common.make_suite(BloscLZ4TestCase))
-+        theSuite.addTest(common.make_suite(BloscLZ4HCTestCase))
-+        theSuite.addTest(common.make_suite(BloscSnappyTestCase))
-+        theSuite.addTest(common.make_suite(BloscZlibTestCase))
-+        theSuite.addTest(common.make_suite(BloscZstdTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2ComprTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2CrossChunkTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2CrossChunkOptTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2PastLastChunkTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2PastLastChunkOptTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2Ndim3MinChunkOptTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2Ndim3ChunkOptTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2Ndim4ChunkOptTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2NDNoChunkshape))
-+        theSuite.addTest(common.make_suite(LZOComprTestCase))
-+        theSuite.addTest(common.make_suite(LZOShuffleTestCase))
-+        theSuite.addTest(common.make_suite(Bzip2ComprTestCase))
-+        theSuite.addTest(common.make_suite(Bzip2ShuffleTestCase))
-+        theSuite.addTest(common.make_suite(FloatTypeTestCase))
-+        theSuite.addTest(common.make_suite(ComplexTypeTestCase))
-+        theSuite.addTest(common.make_suite(StringTestCase))
-+        theSuite.addTest(common.make_suite(String2TestCase))
-+        theSuite.addTest(common.make_suite(StringComprTestCase))
-+        theSuite.addTest(common.make_suite(Int8TestCase))
-+        theSuite.addTest(common.make_suite(Int16TestCase))
-+        theSuite.addTest(common.make_suite(Int32TestCase))
-+        theSuite.addTest(common.make_suite(Float16TestCase))
-+        theSuite.addTest(common.make_suite(Float32TestCase))
-+        theSuite.addTest(common.make_suite(Float64TestCase))
-+        theSuite.addTest(common.make_suite(Float96TestCase))
-+        theSuite.addTest(common.make_suite(Float128TestCase))
-+        theSuite.addTest(common.make_suite(Complex64TestCase))
-+        theSuite.addTest(common.make_suite(Complex128TestCase))
-+        theSuite.addTest(common.make_suite(Complex192TestCase))
-+        theSuite.addTest(common.make_suite(Complex256TestCase))
-+        theSuite.addTest(common.make_suite(ComprTestCase))
-+        theSuite.addTest(common.make_suite(OffsetStrideTestCase))
-+        theSuite.addTest(common.make_suite(Fletcher32TestCase))
-+        theSuite.addTest(common.make_suite(AllFiltersTestCase))
-+        theSuite.addTest(common.make_suite(ReadOutArgumentTests))
-+        theSuite.addTest(common.make_suite(
-             SizeOnDiskInMemoryPropertyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CloseCopyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(OpenCopyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex1TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex2TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex3TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex4TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex5TestCase))
--        theSuite.addTest(common.unittest.makeSuite(BigArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(DfltAtomNoReopen))
--        theSuite.addTest(common.unittest.makeSuite(DfltAtomReopen))
--        theSuite.addTest(common.unittest.makeSuite(AtomDefaultReprNoReopen))
--        theSuite.addTest(common.unittest.makeSuite(AtomDefaultReprReopen))
--        theSuite.addTest(common.unittest.makeSuite(TruncateTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MDAtomNoReopen))
--        theSuite.addTest(common.unittest.makeSuite(MDAtomReopen))
--        theSuite.addTest(common.unittest.makeSuite(MDLargeAtomNoReopen))
--        theSuite.addTest(common.unittest.makeSuite(MDLargeAtomReopen))
--        theSuite.addTest(common.unittest.makeSuite(AccessClosedTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TestCreateCArrayArgs))
-+        theSuite.addTest(common.make_suite(CloseCopyTestCase))
-+        theSuite.addTest(common.make_suite(OpenCopyTestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex1TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex2TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex3TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex4TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex5TestCase))
-+        theSuite.addTest(common.make_suite(BigArrayTestCase))
-+        theSuite.addTest(common.make_suite(DfltAtomNoReopen))
-+        theSuite.addTest(common.make_suite(DfltAtomReopen))
-+        theSuite.addTest(common.make_suite(AtomDefaultReprNoReopen))
-+        theSuite.addTest(common.make_suite(AtomDefaultReprReopen))
-+        theSuite.addTest(common.make_suite(TruncateTestCase))
-+        theSuite.addTest(common.make_suite(MDAtomNoReopen))
-+        theSuite.addTest(common.make_suite(MDAtomReopen))
-+        theSuite.addTest(common.make_suite(MDLargeAtomNoReopen))
-+        theSuite.addTest(common.make_suite(MDLargeAtomReopen))
-+        theSuite.addTest(common.make_suite(AccessClosedTestCase))
-+        theSuite.addTest(common.make_suite(TestCreateCArrayArgs))
-     if common.heavy:
--        theSuite.addTest(common.unittest.makeSuite(Slices3CArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Slices4CArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Ellipsis4CArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Ellipsis5CArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Ellipsis6CArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Ellipsis7CArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MD3WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MD5WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MD6WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MD7WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MD10WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex6TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex7TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex8TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex9TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex10TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex11TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex12TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Rows64bitsTestCase1))
--        theSuite.addTest(common.unittest.makeSuite(Rows64bitsTestCase2))
-+        theSuite.addTest(common.make_suite(Slices3CArrayTestCase))
-+        theSuite.addTest(common.make_suite(Slices4CArrayTestCase))
-+        theSuite.addTest(common.make_suite(Ellipsis4CArrayTestCase))
-+        theSuite.addTest(common.make_suite(Ellipsis5CArrayTestCase))
-+        theSuite.addTest(common.make_suite(Ellipsis6CArrayTestCase))
-+        theSuite.addTest(common.make_suite(Ellipsis7CArrayTestCase))
-+        theSuite.addTest(common.make_suite(MD3WriteTestCase))
-+        theSuite.addTest(common.make_suite(MD5WriteTestCase))
-+        theSuite.addTest(common.make_suite(MD6WriteTestCase))
-+        theSuite.addTest(common.make_suite(MD7WriteTestCase))
-+        theSuite.addTest(common.make_suite(MD10WriteTestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex6TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex7TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex8TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex9TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex10TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex11TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex12TestCase))
-+        theSuite.addTest(common.make_suite(Rows64bitsTestCase1))
-+        theSuite.addTest(common.make_suite(Rows64bitsTestCase2))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_create.py b/tables/tests/test_create.py
-index 1270efef2..3e010c488 100644
---- a/tables/tests/test_create.py
-+++ b/tables/tests/test_create.py
-@@ -2515,68 +2515,68 @@ def suite():
-     # common.heavy = 1 # Uncomment this only for testing purposes!
- 
-     for i in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(FiltersCase1))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCase2))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCase10))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCaseBloscBloscLZ))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCaseBloscLZ4))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCaseBloscLZ4HC))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCaseBloscSnappy))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCaseBloscZlib))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCaseBloscZstd))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCaseBloscBitShuffle))
--        theSuite.addTest(common.unittest.makeSuite(CopyGroupCase1))
--        theSuite.addTest(common.unittest.makeSuite(CopyGroupCase2))
--        theSuite.addTest(common.unittest.makeSuite(CopyFileCase1))
--        theSuite.addTest(common.unittest.makeSuite(CopyFileCase2))
--        theSuite.addTest(common.unittest.makeSuite(GroupFiltersTestCase))
--        theSuite.addTest(common.unittest.makeSuite(SetBloscMaxThreadsTestCase))
--        theSuite.addTest(common.unittest.makeSuite(FilterTestCase))
-+        theSuite.addTest(common.make_suite(FiltersCase1))
-+        theSuite.addTest(common.make_suite(FiltersCase2))
-+        theSuite.addTest(common.make_suite(FiltersCase10))
-+        theSuite.addTest(common.make_suite(FiltersCaseBloscBloscLZ))
-+        theSuite.addTest(common.make_suite(FiltersCaseBloscLZ4))
-+        theSuite.addTest(common.make_suite(FiltersCaseBloscLZ4HC))
-+        theSuite.addTest(common.make_suite(FiltersCaseBloscSnappy))
-+        theSuite.addTest(common.make_suite(FiltersCaseBloscZlib))
-+        theSuite.addTest(common.make_suite(FiltersCaseBloscZstd))
-+        theSuite.addTest(common.make_suite(FiltersCaseBloscBitShuffle))
-+        theSuite.addTest(common.make_suite(CopyGroupCase1))
-+        theSuite.addTest(common.make_suite(CopyGroupCase2))
-+        theSuite.addTest(common.make_suite(CopyFileCase1))
-+        theSuite.addTest(common.make_suite(CopyFileCase2))
-+        theSuite.addTest(common.make_suite(GroupFiltersTestCase))
-+        theSuite.addTest(common.make_suite(SetBloscMaxThreadsTestCase))
-+        theSuite.addTest(common.make_suite(FilterTestCase))
-         theSuite.addTest(doctest.DocTestSuite(tb.filters))
- 
--        theSuite.addTest(common.unittest.makeSuite(DefaultDriverTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Sec2DriverTestCase))
--        theSuite.addTest(common.unittest.makeSuite(StdioDriverTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CoreDriverTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(DefaultDriverTestCase))
-+        theSuite.addTest(common.make_suite(Sec2DriverTestCase))
-+        theSuite.addTest(common.make_suite(StdioDriverTestCase))
-+        theSuite.addTest(common.make_suite(CoreDriverTestCase))
-+        theSuite.addTest(common.make_suite(
-             CoreDriverNoBackingStoreTestCase))
--        theSuite.addTest(common.unittest.makeSuite(SplitDriverTestCase))
-+        theSuite.addTest(common.make_suite(SplitDriverTestCase))
- 
--        theSuite.addTest(common.unittest.makeSuite(LogDriverTestCase))
--        theSuite.addTest(common.unittest.makeSuite(DirectDriverTestCase))
--        theSuite.addTest(common.unittest.makeSuite(WindowsDriverTestCase))
-+        theSuite.addTest(common.make_suite(LogDriverTestCase))
-+        theSuite.addTest(common.make_suite(DirectDriverTestCase))
-+        theSuite.addTest(common.make_suite(WindowsDriverTestCase))
- 
--        theSuite.addTest(common.unittest.makeSuite(FamilyDriverTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MultiDriverTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MpioDriverTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MpiPosixDriverTestCase))
--        theSuite.addTest(common.unittest.makeSuite(StreamDriverTestCase))
--        theSuite.addTest(common.unittest.makeSuite(InMemoryCoreDriverTestCase))
-+        theSuite.addTest(common.make_suite(FamilyDriverTestCase))
-+        theSuite.addTest(common.make_suite(MultiDriverTestCase))
-+        theSuite.addTest(common.make_suite(MpioDriverTestCase))
-+        theSuite.addTest(common.make_suite(MpiPosixDriverTestCase))
-+        theSuite.addTest(common.make_suite(StreamDriverTestCase))
-+        theSuite.addTest(common.make_suite(InMemoryCoreDriverTestCase))
- 
--        theSuite.addTest(common.unittest.makeSuite(QuantizeTestCase))
-+        theSuite.addTest(common.make_suite(QuantizeTestCase))
- 
-     if common.heavy:
--        theSuite.addTest(common.unittest.makeSuite(CreateTestCase))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCase3))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCase4))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCase5))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCase6))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCase7))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCase8))
--        theSuite.addTest(common.unittest.makeSuite(FiltersCase9))
--        theSuite.addTest(common.unittest.makeSuite(CopyFileCase3))
--        theSuite.addTest(common.unittest.makeSuite(CopyFileCase4))
--        theSuite.addTest(common.unittest.makeSuite(CopyFileCase5))
--        theSuite.addTest(common.unittest.makeSuite(CopyFileCase6))
--        theSuite.addTest(common.unittest.makeSuite(CopyFileCase7))
--        theSuite.addTest(common.unittest.makeSuite(CopyFileCase8))
--        theSuite.addTest(common.unittest.makeSuite(CopyFileCase10))
--        theSuite.addTest(common.unittest.makeSuite(CopyGroupCase3))
--        theSuite.addTest(common.unittest.makeSuite(CopyGroupCase4))
--        theSuite.addTest(common.unittest.makeSuite(CopyGroupCase5))
--        theSuite.addTest(common.unittest.makeSuite(CopyGroupCase6))
--        theSuite.addTest(common.unittest.makeSuite(CopyGroupCase7))
--        theSuite.addTest(common.unittest.makeSuite(CopyGroupCase8))
-+        theSuite.addTest(common.make_suite(CreateTestCase))
-+        theSuite.addTest(common.make_suite(FiltersCase3))
-+        theSuite.addTest(common.make_suite(FiltersCase4))
-+        theSuite.addTest(common.make_suite(FiltersCase5))
-+        theSuite.addTest(common.make_suite(FiltersCase6))
-+        theSuite.addTest(common.make_suite(FiltersCase7))
-+        theSuite.addTest(common.make_suite(FiltersCase8))
-+        theSuite.addTest(common.make_suite(FiltersCase9))
-+        theSuite.addTest(common.make_suite(CopyFileCase3))
-+        theSuite.addTest(common.make_suite(CopyFileCase4))
-+        theSuite.addTest(common.make_suite(CopyFileCase5))
-+        theSuite.addTest(common.make_suite(CopyFileCase6))
-+        theSuite.addTest(common.make_suite(CopyFileCase7))
-+        theSuite.addTest(common.make_suite(CopyFileCase8))
-+        theSuite.addTest(common.make_suite(CopyFileCase10))
-+        theSuite.addTest(common.make_suite(CopyGroupCase3))
-+        theSuite.addTest(common.make_suite(CopyGroupCase4))
-+        theSuite.addTest(common.make_suite(CopyGroupCase5))
-+        theSuite.addTest(common.make_suite(CopyGroupCase6))
-+        theSuite.addTest(common.make_suite(CopyGroupCase7))
-+        theSuite.addTest(common.make_suite(CopyGroupCase8))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_do_undo.py b/tables/tests/test_do_undo.py
-index bbedb7d01..a8238a57f 100644
---- a/tables/tests/test_do_undo.py
-+++ b/tables/tests/test_do_undo.py
-@@ -2705,18 +2705,18 @@ def suite():
-     # common.heavy = 1  # uncomment this only for testing purposes
- 
-     for n in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(BasicTestCase))
--        theSuite.addTest(common.unittest.makeSuite(PersistenceTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CreateArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CreateGroupTestCase))
--        theSuite.addTest(common.unittest.makeSuite(RenameNodeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MoveNodeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(RemoveNodeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyNodeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(AttributesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ComplexTestCase))
--        theSuite.addTest(common.unittest.makeSuite(NotLoggedTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CreateParentsTestCase))
-+        theSuite.addTest(common.make_suite(BasicTestCase))
-+        theSuite.addTest(common.make_suite(PersistenceTestCase))
-+        theSuite.addTest(common.make_suite(CreateArrayTestCase))
-+        theSuite.addTest(common.make_suite(CreateGroupTestCase))
-+        theSuite.addTest(common.make_suite(RenameNodeTestCase))
-+        theSuite.addTest(common.make_suite(MoveNodeTestCase))
-+        theSuite.addTest(common.make_suite(RemoveNodeTestCase))
-+        theSuite.addTest(common.make_suite(CopyNodeTestCase))
-+        theSuite.addTest(common.make_suite(AttributesTestCase))
-+        theSuite.addTest(common.make_suite(ComplexTestCase))
-+        theSuite.addTest(common.make_suite(NotLoggedTestCase))
-+        theSuite.addTest(common.make_suite(CreateParentsTestCase))
-     if common.heavy:
-         pass
- 
-diff --git a/tables/tests/test_earray.py b/tables/tests/test_earray.py
-index 0c9ce45d5..cb1699a2e 100644
---- a/tables/tests/test_earray.py
-+++ b/tables/tests/test_earray.py
-@@ -2878,85 +2878,85 @@ def suite():
-     niter = 1
-     # common.heavy = 1  # uncomment this only for testing purposes
- 
--    # theSuite.addTest(unittest.makeSuite(BasicWriteTestCase))
--    # theSuite.addTest(unittest.makeSuite(Rows64bitsTestCase1))
--    # theSuite.addTest(unittest.makeSuite(Rows64bitsTestCase2))
-+    # theSuite.addTest(make_suite(BasicWriteTestCase))
-+    # theSuite.addTest(make_suite(Rows64bitsTestCase1))
-+    # theSuite.addTest(make_suite(Rows64bitsTestCase2))
-     for n in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(BasicWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic2WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic3WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic4WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic5WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic6WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic7WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic8WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(EmptyEArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Empty2EArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(SlicesEArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Slices2EArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(EllipsisEArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Ellipsis2EArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Ellipsis3EArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ZlibComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ZlibShuffleTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscShuffleTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2SlicesOptEArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2ComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2CrossChunkTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2CrossChunkOptTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2InnerCrossChunkTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2InnerCrossChunkOptTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2PastLastChunkTestCase))
--        theSuite.addTest(common.unittest.makeSuite(LZOComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(LZOShuffleTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Bzip2ComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Bzip2ShuffleTestCase))
--        theSuite.addTest(common.unittest.makeSuite(FloatTypeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ComplexTypeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(StringTestCase))
--        theSuite.addTest(common.unittest.makeSuite(String2TestCase))
--        theSuite.addTest(common.unittest.makeSuite(StringComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(BasicWriteTestCase))
-+        theSuite.addTest(common.make_suite(Basic2WriteTestCase))
-+        theSuite.addTest(common.make_suite(Basic3WriteTestCase))
-+        theSuite.addTest(common.make_suite(Basic4WriteTestCase))
-+        theSuite.addTest(common.make_suite(Basic5WriteTestCase))
-+        theSuite.addTest(common.make_suite(Basic6WriteTestCase))
-+        theSuite.addTest(common.make_suite(Basic7WriteTestCase))
-+        theSuite.addTest(common.make_suite(Basic8WriteTestCase))
-+        theSuite.addTest(common.make_suite(EmptyEArrayTestCase))
-+        theSuite.addTest(common.make_suite(Empty2EArrayTestCase))
-+        theSuite.addTest(common.make_suite(SlicesEArrayTestCase))
-+        theSuite.addTest(common.make_suite(Slices2EArrayTestCase))
-+        theSuite.addTest(common.make_suite(EllipsisEArrayTestCase))
-+        theSuite.addTest(common.make_suite(Ellipsis2EArrayTestCase))
-+        theSuite.addTest(common.make_suite(Ellipsis3EArrayTestCase))
-+        theSuite.addTest(common.make_suite(ZlibComprTestCase))
-+        theSuite.addTest(common.make_suite(ZlibShuffleTestCase))
-+        theSuite.addTest(common.make_suite(BloscComprTestCase))
-+        theSuite.addTest(common.make_suite(BloscShuffleTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2SlicesOptEArrayTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2ComprTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2CrossChunkTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2CrossChunkOptTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2InnerCrossChunkTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2InnerCrossChunkOptTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2PastLastChunkTestCase))
-+        theSuite.addTest(common.make_suite(LZOComprTestCase))
-+        theSuite.addTest(common.make_suite(LZOShuffleTestCase))
-+        theSuite.addTest(common.make_suite(Bzip2ComprTestCase))
-+        theSuite.addTest(common.make_suite(Bzip2ShuffleTestCase))
-+        theSuite.addTest(common.make_suite(FloatTypeTestCase))
-+        theSuite.addTest(common.make_suite(ComplexTypeTestCase))
-+        theSuite.addTest(common.make_suite(StringTestCase))
-+        theSuite.addTest(common.make_suite(String2TestCase))
-+        theSuite.addTest(common.make_suite(StringComprTestCase))
-+        theSuite.addTest(common.make_suite(
-             SizeOnDiskInMemoryPropertyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(OffsetStrideTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Fletcher32TestCase))
--        theSuite.addTest(common.unittest.makeSuite(AllFiltersTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CloseCopyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(OpenCopyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex1TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex2TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex3TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex4TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex5TestCase))
--        theSuite.addTest(common.unittest.makeSuite(TruncateOpenTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TruncateCloseTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ZeroSizedTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MDAtomNoReopen))
--        theSuite.addTest(common.unittest.makeSuite(MDAtomReopen))
--        theSuite.addTest(common.unittest.makeSuite(AccessClosedTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TestCreateEArrayArgs))
-+        theSuite.addTest(common.make_suite(OffsetStrideTestCase))
-+        theSuite.addTest(common.make_suite(Fletcher32TestCase))
-+        theSuite.addTest(common.make_suite(AllFiltersTestCase))
-+        theSuite.addTest(common.make_suite(CloseCopyTestCase))
-+        theSuite.addTest(common.make_suite(OpenCopyTestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex1TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex2TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex3TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex4TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex5TestCase))
-+        theSuite.addTest(common.make_suite(TruncateOpenTestCase))
-+        theSuite.addTest(common.make_suite(TruncateCloseTestCase))
-+        theSuite.addTest(common.make_suite(ZeroSizedTestCase))
-+        theSuite.addTest(common.make_suite(MDAtomNoReopen))
-+        theSuite.addTest(common.make_suite(MDAtomReopen))
-+        theSuite.addTest(common.make_suite(AccessClosedTestCase))
-+        theSuite.addTest(common.make_suite(TestCreateEArrayArgs))
-     if common.heavy:
--        theSuite.addTest(common.unittest.makeSuite(Slices3EArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Slices4EArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Ellipsis4EArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Ellipsis5EArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Ellipsis6EArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Ellipsis7EArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MD3WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MD5WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MD6WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MD7WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MD10WriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex6TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex7TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex8TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex9TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex10TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex11TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex12TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Rows64bitsTestCase1))
--        theSuite.addTest(common.unittest.makeSuite(Rows64bitsTestCase2))
-+        theSuite.addTest(common.make_suite(Slices3EArrayTestCase))
-+        theSuite.addTest(common.make_suite(Slices4EArrayTestCase))
-+        theSuite.addTest(common.make_suite(Ellipsis4EArrayTestCase))
-+        theSuite.addTest(common.make_suite(Ellipsis5EArrayTestCase))
-+        theSuite.addTest(common.make_suite(Ellipsis6EArrayTestCase))
-+        theSuite.addTest(common.make_suite(Ellipsis7EArrayTestCase))
-+        theSuite.addTest(common.make_suite(MD3WriteTestCase))
-+        theSuite.addTest(common.make_suite(MD5WriteTestCase))
-+        theSuite.addTest(common.make_suite(MD6WriteTestCase))
-+        theSuite.addTest(common.make_suite(MD7WriteTestCase))
-+        theSuite.addTest(common.make_suite(MD10WriteTestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex6TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex7TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex8TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex9TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex10TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex11TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex12TestCase))
-+        theSuite.addTest(common.make_suite(Rows64bitsTestCase1))
-+        theSuite.addTest(common.make_suite(Rows64bitsTestCase2))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_enum.py b/tables/tests/test_enum.py
-index 8c1cd153d..7062245d4 100644
---- a/tables/tests/test_enum.py
-+++ b/tables/tests/test_enum.py
-@@ -638,14 +638,14 @@ def suite():
-     theSuite = common.unittest.TestSuite()
-     niter = 1
- 
--    # theSuite.addTest(unittest.makeSuite(EnumTableTestCase))
-+    # theSuite.addTest(make_suite(EnumTableTestCase))
-     for i in range(niter):
-         theSuite.addTest(doctest.DocTestSuite(tb.misc.enum))
--        theSuite.addTest(common.unittest.makeSuite(CreateColTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CreateAtomTestCase))
--        theSuite.addTest(common.unittest.makeSuite(EnumTableTestCase))
--        theSuite.addTest(common.unittest.makeSuite(EnumEArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(EnumVLArrayTestCase))
-+        theSuite.addTest(common.make_suite(CreateColTestCase))
-+        theSuite.addTest(common.make_suite(CreateAtomTestCase))
-+        theSuite.addTest(common.make_suite(EnumTableTestCase))
-+        theSuite.addTest(common.make_suite(EnumEArrayTestCase))
-+        theSuite.addTest(common.make_suite(EnumVLArrayTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_expression.py b/tables/tests/test_expression.py
-index 93c6e8e44..146cd55bd 100644
---- a/tables/tests/test_expression.py
-+++ b/tables/tests/test_expression.py
-@@ -1501,56 +1501,56 @@ def suite():
-     # common.heavy = 1  # uncomment this only for testing purposes
- 
-     for i in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(ExprNumPy))
--        theSuite.addTest(common.unittest.makeSuite(ExprArray))
--        theSuite.addTest(common.unittest.makeSuite(ExprCArray))
--        theSuite.addTest(common.unittest.makeSuite(ExprEArray))
--        theSuite.addTest(common.unittest.makeSuite(ExprColumn))
--        theSuite.addTest(common.unittest.makeSuite(MixedContainers0))
--        theSuite.addTest(common.unittest.makeSuite(MixedContainers1))
--        theSuite.addTest(common.unittest.makeSuite(MixedContainers2))
--        theSuite.addTest(common.unittest.makeSuite(MixedContainers3))
--        theSuite.addTest(common.unittest.makeSuite(UnalignedObject))
--        theSuite.addTest(common.unittest.makeSuite(NonContiguousObject))
--        theSuite.addTest(common.unittest.makeSuite(ExprError))
--        theSuite.addTest(common.unittest.makeSuite(Broadcast0))
--        theSuite.addTest(common.unittest.makeSuite(Broadcast1))
--        theSuite.addTest(common.unittest.makeSuite(Broadcast2))
--        theSuite.addTest(common.unittest.makeSuite(Broadcast3))
--        theSuite.addTest(common.unittest.makeSuite(Broadcast4))
--        theSuite.addTest(common.unittest.makeSuite(Broadcast5))
--        theSuite.addTest(common.unittest.makeSuite(DiffLength0))
--        theSuite.addTest(common.unittest.makeSuite(DiffLength1))
--        theSuite.addTest(common.unittest.makeSuite(DiffLength2))
--        theSuite.addTest(common.unittest.makeSuite(DiffLength3))
--        theSuite.addTest(common.unittest.makeSuite(DiffLength4))
--        theSuite.addTest(common.unittest.makeSuite(TypesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(FunctionsTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Maindim0))
--        theSuite.addTest(common.unittest.makeSuite(Maindim1))
--        theSuite.addTest(common.unittest.makeSuite(Maindim2))
--        theSuite.addTest(common.unittest.makeSuite(Maindim3))
--        theSuite.addTest(common.unittest.makeSuite(AppendModeTrue))
--        theSuite.addTest(common.unittest.makeSuite(AppendModeFalse))
--        theSuite.addTest(common.unittest.makeSuite(iter0))
--        theSuite.addTest(common.unittest.makeSuite(iter1))
--        theSuite.addTest(common.unittest.makeSuite(iter2))
--        theSuite.addTest(common.unittest.makeSuite(iter3))
--        theSuite.addTest(common.unittest.makeSuite(iter4))
--        theSuite.addTest(common.unittest.makeSuite(iter5))
--        theSuite.addTest(common.unittest.makeSuite(setOutputRange0))
--        theSuite.addTest(common.unittest.makeSuite(setOutputRange1))
--        theSuite.addTest(common.unittest.makeSuite(setOutputRange2))
--        theSuite.addTest(common.unittest.makeSuite(setOutputRange3))
--        theSuite.addTest(common.unittest.makeSuite(setOutputRange4))
--        theSuite.addTest(common.unittest.makeSuite(setOutputRange5))
--        theSuite.addTest(common.unittest.makeSuite(setOutputRange6))
--        theSuite.addTest(common.unittest.makeSuite(setOutputRange7))
--        theSuite.addTest(common.unittest.makeSuite(setOutputRange8))
--        theSuite.addTest(common.unittest.makeSuite(setOutputRange9))
--        theSuite.addTest(common.unittest.makeSuite(VeryLargeInputs1))
-+        theSuite.addTest(common.make_suite(ExprNumPy))
-+        theSuite.addTest(common.make_suite(ExprArray))
-+        theSuite.addTest(common.make_suite(ExprCArray))
-+        theSuite.addTest(common.make_suite(ExprEArray))
-+        theSuite.addTest(common.make_suite(ExprColumn))
-+        theSuite.addTest(common.make_suite(MixedContainers0))
-+        theSuite.addTest(common.make_suite(MixedContainers1))
-+        theSuite.addTest(common.make_suite(MixedContainers2))
-+        theSuite.addTest(common.make_suite(MixedContainers3))
-+        theSuite.addTest(common.make_suite(UnalignedObject))
-+        theSuite.addTest(common.make_suite(NonContiguousObject))
-+        theSuite.addTest(common.make_suite(ExprError))
-+        theSuite.addTest(common.make_suite(Broadcast0))
-+        theSuite.addTest(common.make_suite(Broadcast1))
-+        theSuite.addTest(common.make_suite(Broadcast2))
-+        theSuite.addTest(common.make_suite(Broadcast3))
-+        theSuite.addTest(common.make_suite(Broadcast4))
-+        theSuite.addTest(common.make_suite(Broadcast5))
-+        theSuite.addTest(common.make_suite(DiffLength0))
-+        theSuite.addTest(common.make_suite(DiffLength1))
-+        theSuite.addTest(common.make_suite(DiffLength2))
-+        theSuite.addTest(common.make_suite(DiffLength3))
-+        theSuite.addTest(common.make_suite(DiffLength4))
-+        theSuite.addTest(common.make_suite(TypesTestCase))
-+        theSuite.addTest(common.make_suite(FunctionsTestCase))
-+        theSuite.addTest(common.make_suite(Maindim0))
-+        theSuite.addTest(common.make_suite(Maindim1))
-+        theSuite.addTest(common.make_suite(Maindim2))
-+        theSuite.addTest(common.make_suite(Maindim3))
-+        theSuite.addTest(common.make_suite(AppendModeTrue))
-+        theSuite.addTest(common.make_suite(AppendModeFalse))
-+        theSuite.addTest(common.make_suite(iter0))
-+        theSuite.addTest(common.make_suite(iter1))
-+        theSuite.addTest(common.make_suite(iter2))
-+        theSuite.addTest(common.make_suite(iter3))
-+        theSuite.addTest(common.make_suite(iter4))
-+        theSuite.addTest(common.make_suite(iter5))
-+        theSuite.addTest(common.make_suite(setOutputRange0))
-+        theSuite.addTest(common.make_suite(setOutputRange1))
-+        theSuite.addTest(common.make_suite(setOutputRange2))
-+        theSuite.addTest(common.make_suite(setOutputRange3))
-+        theSuite.addTest(common.make_suite(setOutputRange4))
-+        theSuite.addTest(common.make_suite(setOutputRange5))
-+        theSuite.addTest(common.make_suite(setOutputRange6))
-+        theSuite.addTest(common.make_suite(setOutputRange7))
-+        theSuite.addTest(common.make_suite(setOutputRange8))
-+        theSuite.addTest(common.make_suite(setOutputRange9))
-+        theSuite.addTest(common.make_suite(VeryLargeInputs1))
-         if common.heavy:
--            theSuite.addTest(common.unittest.makeSuite(VeryLargeInputs2))
-+            theSuite.addTest(common.make_suite(VeryLargeInputs2))
-     return theSuite
- 
- 
-diff --git a/tables/tests/test_garbage.py b/tables/tests/test_garbage.py
-index 7914ff3b0..808830e42 100644
---- a/tables/tests/test_garbage.py
-+++ b/tables/tests/test_garbage.py
-@@ -40,7 +40,7 @@ def suite():
-     """Return a test suite consisting of all the test cases in the module."""
- 
-     theSuite = common.unittest.TestSuite()
--    theSuite.addTest(common.unittest.makeSuite(GarbageTestCase))
-+    theSuite.addTest(common.make_suite(GarbageTestCase))
-     return theSuite
- 
- 
-diff --git a/tables/tests/test_hdf5compat.py b/tables/tests/test_hdf5compat.py
-index cb3b1407e..fbe371b78 100644
---- a/tables/tests/test_hdf5compat.py
-+++ b/tables/tests/test_hdf5compat.py
-@@ -374,24 +374,24 @@ def suite():
-     niter = 1
- 
-     for i in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(PaddedArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(EnumTestCase))
--        theSuite.addTest(common.unittest.makeSuite(F64BETestCase))
--        theSuite.addTest(common.unittest.makeSuite(F64LETestCase))
--        theSuite.addTest(common.unittest.makeSuite(I64BETestCase))
--        theSuite.addTest(common.unittest.makeSuite(I64LETestCase))
--        theSuite.addTest(common.unittest.makeSuite(I32BETestCase))
--        theSuite.addTest(common.unittest.makeSuite(I32LETestCase))
--        theSuite.addTest(common.unittest.makeSuite(ChunkedCompoundTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ContiguousCompoundTestCase))
-+        theSuite.addTest(common.make_suite(PaddedArrayTestCase))
-+        theSuite.addTest(common.make_suite(EnumTestCase))
-+        theSuite.addTest(common.make_suite(F64BETestCase))
-+        theSuite.addTest(common.make_suite(F64LETestCase))
-+        theSuite.addTest(common.make_suite(I64BETestCase))
-+        theSuite.addTest(common.make_suite(I64LETestCase))
-+        theSuite.addTest(common.make_suite(I32BETestCase))
-+        theSuite.addTest(common.make_suite(I32LETestCase))
-+        theSuite.addTest(common.make_suite(ChunkedCompoundTestCase))
-+        theSuite.addTest(common.make_suite(ContiguousCompoundTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(ContiguousCompoundAppendTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ExtendibleTestCase))
--        theSuite.addTest(common.unittest.makeSuite(SzipTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MatlabFileTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ObjectReferenceTestCase))
-+            common.make_suite(ContiguousCompoundAppendTestCase))
-+        theSuite.addTest(common.make_suite(ExtendibleTestCase))
-+        theSuite.addTest(common.make_suite(SzipTestCase))
-+        theSuite.addTest(common.make_suite(MatlabFileTestCase))
-+        theSuite.addTest(common.make_suite(ObjectReferenceTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(ObjectReferenceRecursiveTestCase))
-+            common.make_suite(ObjectReferenceRecursiveTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_index_backcompat.py b/tables/tests/test_index_backcompat.py
-index a3f404f76..d921baaf2 100644
---- a/tables/tests/test_index_backcompat.py
-+++ b/tables/tests/test_index_backcompat.py
-@@ -153,8 +153,8 @@ def suite():
-     niter = 1
- 
-     for n in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(Indexes2_0TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Indexes2_1TestCase))
-+        theSuite.addTest(common.make_suite(Indexes2_0TestCase))
-+        theSuite.addTest(common.make_suite(Indexes2_1TestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_indexes.py b/tables/tests/test_indexes.py
-index 9066a9151..a4c7de49f 100644
---- a/tables/tests/test_indexes.py
-+++ b/tables/tests/test_indexes.py
-@@ -2666,47 +2666,47 @@ def suite():
-     # heavy = 1  # Uncomment this only for testing purposes!
- 
-     for n in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(BasicReadTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ZlibReadTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscReadTestCase))
--        theSuite.addTest(common.unittest.makeSuite(LZOReadTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Bzip2ReadTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ShuffleReadTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Fletcher32ReadTestCase))
-+        theSuite.addTest(common.make_suite(BasicReadTestCase))
-+        theSuite.addTest(common.make_suite(ZlibReadTestCase))
-+        theSuite.addTest(common.make_suite(BloscReadTestCase))
-+        theSuite.addTest(common.make_suite(LZOReadTestCase))
-+        theSuite.addTest(common.make_suite(Bzip2ReadTestCase))
-+        theSuite.addTest(common.make_suite(ShuffleReadTestCase))
-+        theSuite.addTest(common.make_suite(Fletcher32ReadTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(ShuffleFletcher32ReadTestCase))
--        theSuite.addTest(common.unittest.makeSuite(OneHalfTestCase))
--        theSuite.addTest(common.unittest.makeSuite(UpperBoundTestCase))
--        theSuite.addTest(common.unittest.makeSuite(LowerBoundTestCase))
--        theSuite.addTest(common.unittest.makeSuite(AI1TestCase))
--        theSuite.addTest(common.unittest.makeSuite(AI2TestCase))
--        theSuite.addTest(common.unittest.makeSuite(AI9TestCase))
--        theSuite.addTest(common.unittest.makeSuite(DeepTableIndexTestCase))
--        theSuite.addTest(common.unittest.makeSuite(IndexPropsChangeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(IndexFiltersTestCase))
--        theSuite.addTest(common.unittest.makeSuite(OldIndexTestCase))
-+            common.make_suite(ShuffleFletcher32ReadTestCase))
-+        theSuite.addTest(common.make_suite(OneHalfTestCase))
-+        theSuite.addTest(common.make_suite(UpperBoundTestCase))
-+        theSuite.addTest(common.make_suite(LowerBoundTestCase))
-+        theSuite.addTest(common.make_suite(AI1TestCase))
-+        theSuite.addTest(common.make_suite(AI2TestCase))
-+        theSuite.addTest(common.make_suite(AI9TestCase))
-+        theSuite.addTest(common.make_suite(DeepTableIndexTestCase))
-+        theSuite.addTest(common.make_suite(IndexPropsChangeTestCase))
-+        theSuite.addTest(common.make_suite(IndexFiltersTestCase))
-+        theSuite.addTest(common.make_suite(OldIndexTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompletelySortedIndexTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ManyNodesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ReadSortedIndex0))
--        theSuite.addTest(common.unittest.makeSuite(ReadSortedIndex3))
--        theSuite.addTest(common.unittest.makeSuite(ReadSortedIndex6))
--        theSuite.addTest(common.unittest.makeSuite(ReadSortedIndex9))
--        theSuite.addTest(common.unittest.makeSuite(Issue156TestCase01))
--        theSuite.addTest(common.unittest.makeSuite(Issue156TestCase02))
--        theSuite.addTest(common.unittest.makeSuite(Issue119Time32ColTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Issue119Time64ColTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TestIndexingNans))
-+            common.make_suite(CompletelySortedIndexTestCase))
-+        theSuite.addTest(common.make_suite(ManyNodesTestCase))
-+        theSuite.addTest(common.make_suite(ReadSortedIndex0))
-+        theSuite.addTest(common.make_suite(ReadSortedIndex3))
-+        theSuite.addTest(common.make_suite(ReadSortedIndex6))
-+        theSuite.addTest(common.make_suite(ReadSortedIndex9))
-+        theSuite.addTest(common.make_suite(Issue156TestCase01))
-+        theSuite.addTest(common.make_suite(Issue156TestCase02))
-+        theSuite.addTest(common.make_suite(Issue119Time32ColTestCase))
-+        theSuite.addTest(common.make_suite(Issue119Time64ColTestCase))
-+        theSuite.addTest(common.make_suite(TestIndexingNans))
-     if common.heavy:
-         # These are too heavy for normal testing
--        theSuite.addTest(common.unittest.makeSuite(AI4bTestCase))
--        theSuite.addTest(common.unittest.makeSuite(AI5TestCase))
--        theSuite.addTest(common.unittest.makeSuite(AI6TestCase))
--        theSuite.addTest(common.unittest.makeSuite(AI7TestCase))
--        theSuite.addTest(common.unittest.makeSuite(AI8TestCase))
--        theSuite.addTest(common.unittest.makeSuite(AI10TestCase))
--        theSuite.addTest(common.unittest.makeSuite(AI11TestCase))
--        theSuite.addTest(common.unittest.makeSuite(AI12TestCase))
-+        theSuite.addTest(common.make_suite(AI4bTestCase))
-+        theSuite.addTest(common.make_suite(AI5TestCase))
-+        theSuite.addTest(common.make_suite(AI6TestCase))
-+        theSuite.addTest(common.make_suite(AI7TestCase))
-+        theSuite.addTest(common.make_suite(AI8TestCase))
-+        theSuite.addTest(common.make_suite(AI10TestCase))
-+        theSuite.addTest(common.make_suite(AI11TestCase))
-+        theSuite.addTest(common.make_suite(AI12TestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_indexvalues.py b/tables/tests/test_indexvalues.py
-index 6d57f59b3..87ac4e13d 100644
---- a/tables/tests/test_indexvalues.py
-+++ b/tables/tests/test_indexvalues.py
-@@ -3387,15 +3387,15 @@ def suite():
-         for cdata in iclassdata():
-             class_ = eval(cdata[0])
-             if not class_.heavy:
--                suite_ = common.unittest.makeSuite(class_)
-+                suite_ = common.make_suite(class_)
-                 theSuite.addTest(suite_)
-             elif common.heavy:
--                suite_ = common.unittest.makeSuite(class_)
-+                suite_ = common.make_suite(class_)
-                 theSuite.addTest(suite_)
--        theSuite.addTest(common.unittest.makeSuite(LastRowReuseBuffers))
-+        theSuite.addTest(common.make_suite(LastRowReuseBuffers))
-         theSuite.addTest(
--            common.unittest.makeSuite(BuffersizeMultipleChunksize))
--        theSuite.addTest(common.unittest.makeSuite(SideEffectNumPyQuicksort))
-+            common.make_suite(BuffersizeMultipleChunksize))
-+        theSuite.addTest(common.make_suite(SideEffectNumPyQuicksort))
-     return theSuite
- 
- 
-diff --git a/tables/tests/test_large_tables.py b/tables/tests/test_large_tables.py
-index 776e4a15e..6c0bc72d4 100644
---- a/tables/tests/test_large_tables.py
-+++ b/tables/tests/test_large_tables.py
-@@ -82,10 +82,10 @@ def suite():
-     # common.heavy = 1  # Uncomment this only for testing purposes
- 
-     for n in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(BloscTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Blosc2TestCase))
-+        theSuite.addTest(common.make_suite(BloscTestCase))
-+        theSuite.addTest(common.make_suite(Blosc2TestCase))
-         if common.heavy:
--            theSuite.addTest(common.unittest.makeSuite(ZlibTestCase))
-+            theSuite.addTest(common.make_suite(ZlibTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_links.py b/tables/tests/test_links.py
-index 6b4c04c37..168237c1c 100644
---- a/tables/tests/test_links.py
-+++ b/tables/tests/test_links.py
-@@ -596,9 +596,9 @@ def suite():
-     # common.heavy = 1  # uncomment this only for testing purposes
- 
-     for i in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(HardLinkTestCase))
--        theSuite.addTest(common.unittest.makeSuite(SoftLinkTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ExternalLinkTestCase))
-+        theSuite.addTest(common.make_suite(HardLinkTestCase))
-+        theSuite.addTest(common.make_suite(SoftLinkTestCase))
-+        theSuite.addTest(common.make_suite(ExternalLinkTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_lists.py b/tables/tests/test_lists.py
-index 4419a89e6..ac634a619 100644
---- a/tables/tests/test_lists.py
-+++ b/tables/tests/test_lists.py
-@@ -432,18 +432,18 @@ def suite():
-     niter = 1
- 
-     for i in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(Basic0DOneTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic0DTwoTestCase))
--        # theSuite.addTest(unittest.makeSuite(Basic1DZeroTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic1DOneTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic1DTwoTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic1DFourTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic2DTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic10DTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GI1ListTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GI2ListTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GE1ListTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GE2ListTestCase))
-+        theSuite.addTest(common.make_suite(Basic0DOneTestCase))
-+        theSuite.addTest(common.make_suite(Basic0DTwoTestCase))
-+        # theSuite.addTest(make_suite(Basic1DZeroTestCase))
-+        theSuite.addTest(common.make_suite(Basic1DOneTestCase))
-+        theSuite.addTest(common.make_suite(Basic1DTwoTestCase))
-+        theSuite.addTest(common.make_suite(Basic1DFourTestCase))
-+        theSuite.addTest(common.make_suite(Basic2DTestCase))
-+        theSuite.addTest(common.make_suite(Basic10DTestCase))
-+        theSuite.addTest(common.make_suite(GI1ListTestCase))
-+        theSuite.addTest(common.make_suite(GI2ListTestCase))
-+        theSuite.addTest(common.make_suite(GE1ListTestCase))
-+        theSuite.addTest(common.make_suite(GE2ListTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_nestedtypes.py b/tables/tests/test_nestedtypes.py
-index d5a0275b7..b792d8442 100644
---- a/tables/tests/test_nestedtypes.py
-+++ b/tables/tests/test_nestedtypes.py
-@@ -1476,17 +1476,17 @@ def suite():
-     # common.heavy = 1  # uncomment this only for testing purposes
- 
-     for i in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(DescriptionTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CreateTestCase))
--        theSuite.addTest(common.unittest.makeSuite(WriteNoReopen))
--        theSuite.addTest(common.unittest.makeSuite(WriteReopen))
--        theSuite.addTest(common.unittest.makeSuite(ColsNoReopen))
--        theSuite.addTest(common.unittest.makeSuite(ColsReopen))
--        theSuite.addTest(common.unittest.makeSuite(ReadNoReopen))
--        theSuite.addTest(common.unittest.makeSuite(ReadReopen))
--        theSuite.addTest(common.unittest.makeSuite(SameNestedNoReopen))
--        theSuite.addTest(common.unittest.makeSuite(SameNestedReopen))
--        theSuite.addTest(common.unittest.makeSuite(NestedTypesWithGaps))
-+        theSuite.addTest(common.make_suite(DescriptionTestCase))
-+        theSuite.addTest(common.make_suite(CreateTestCase))
-+        theSuite.addTest(common.make_suite(WriteNoReopen))
-+        theSuite.addTest(common.make_suite(WriteReopen))
-+        theSuite.addTest(common.make_suite(ColsNoReopen))
-+        theSuite.addTest(common.make_suite(ColsReopen))
-+        theSuite.addTest(common.make_suite(ReadNoReopen))
-+        theSuite.addTest(common.make_suite(ReadReopen))
-+        theSuite.addTest(common.make_suite(SameNestedNoReopen))
-+        theSuite.addTest(common.make_suite(SameNestedReopen))
-+        theSuite.addTest(common.make_suite(NestedTypesWithGaps))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_numpy.py b/tables/tests/test_numpy.py
-index 053f2e836..4165783bb 100644
---- a/tables/tests/test_numpy.py
-+++ b/tables/tests/test_numpy.py
-@@ -1369,30 +1369,30 @@ def suite():
-     theSuite = common.unittest.TestSuite()
-     niter = 1
- 
--    # theSuite.addTest(unittest.makeSuite(StrlenOpenTestCase))
--    # theSuite.addTest(unittest.makeSuite(Basic0DOneTestCase))
--    # theSuite.addTest(unittest.makeSuite(GroupsArrayTestCase))
-+    # theSuite.addTest(make_suite(StrlenOpenTestCase))
-+    # theSuite.addTest(make_suite(Basic0DOneTestCase))
-+    # theSuite.addTest(make_suite(GroupsArrayTestCase))
-     for i in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(Basic0DOneTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic0DTwoTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic1DOneTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic1DTwoTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic1DThreeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Basic2DTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GroupsArrayTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TableReadTestCase))
-+        theSuite.addTest(common.make_suite(Basic0DOneTestCase))
-+        theSuite.addTest(common.make_suite(Basic0DTwoTestCase))
-+        theSuite.addTest(common.make_suite(Basic1DOneTestCase))
-+        theSuite.addTest(common.make_suite(Basic1DTwoTestCase))
-+        theSuite.addTest(common.make_suite(Basic1DThreeTestCase))
-+        theSuite.addTest(common.make_suite(Basic2DTestCase))
-+        theSuite.addTest(common.make_suite(GroupsArrayTestCase))
-+        theSuite.addTest(common.make_suite(TableReadTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(TableNativeFlavorOpenTestCase))
-+            common.make_suite(TableNativeFlavorOpenTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(TableNativeFlavorCloseTestCase))
--        theSuite.addTest(common.unittest.makeSuite(AttributesOpenTestCase))
--        theSuite.addTest(common.unittest.makeSuite(AttributesCloseTestCase))
--        theSuite.addTest(common.unittest.makeSuite(StrlenOpenTestCase))
--        theSuite.addTest(common.unittest.makeSuite(StrlenCloseTestCase))
-+            common.make_suite(TableNativeFlavorCloseTestCase))
-+        theSuite.addTest(common.make_suite(AttributesOpenTestCase))
-+        theSuite.addTest(common.make_suite(AttributesCloseTestCase))
-+        theSuite.addTest(common.make_suite(StrlenOpenTestCase))
-+        theSuite.addTest(common.make_suite(StrlenCloseTestCase))
-         if common.heavy:
--            theSuite.addTest(common.unittest.makeSuite(Basic10DTestCase))
-+            theSuite.addTest(common.make_suite(Basic10DTestCase))
-             # The 32 dimensions case takes forever to run!!
--            # theSuite.addTest(unittest.makeSuite(Basic32DTestCase))
-+            # theSuite.addTest(make_suite(Basic32DTestCase))
-     return theSuite
- 
- 
-diff --git a/tables/tests/test_queries.py b/tables/tests/test_queries.py
-index 57e32cef9..e65acd919 100644
---- a/tables/tests/test_queries.py
-+++ b/tables/tests/test_queries.py
-@@ -1243,44 +1243,44 @@ def suite():
-             for cdata in cdatafunc():
-                 class_ = eval(cdata[0])
-                 if heavy or not class_.heavy:
--                    suite_ = common.unittest.makeSuite(class_,
-+                    suite_ = common.make_suite(class_,
-                                                        prefix=autoprefix)
-                     testSuite.addTest(suite_)
-         # Tests on query usage.
--        testSuite.addTest(common.unittest.makeSuite(ScalarTableUsageTestCase))
--        testSuite.addTest(common.unittest.makeSuite(MDTableUsageTestCase))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage1))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage2))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage3))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage4))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage5))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage6))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage7))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage8))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage9))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage10))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage11))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage12))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage13))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage14))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage15))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage16))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage17))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage18))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage19))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage20))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage21))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage22))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage23))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage24))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage25))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage26))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage27))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage28))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage29))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage30))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage31))
--        testSuite.addTest(common.unittest.makeSuite(IndexedTableUsage32))
-+        testSuite.addTest(common.make_suite(ScalarTableUsageTestCase))
-+        testSuite.addTest(common.make_suite(MDTableUsageTestCase))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage1))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage2))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage3))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage4))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage5))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage6))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage7))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage8))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage9))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage10))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage11))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage12))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage13))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage14))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage15))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage16))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage17))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage18))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage19))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage20))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage21))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage22))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage23))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage24))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage25))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage26))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage27))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage28))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage29))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage30))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage31))
-+        testSuite.addTest(common.make_suite(IndexedTableUsage32))
- 
-     return testSuite
- 
-diff --git a/tables/tests/test_suite.py b/tables/tests/test_suite.py
-index 871243d66..328bd0cca 100644
---- a/tables/tests/test_suite.py
-+++ b/tables/tests/test_suite.py
-@@ -48,7 +48,7 @@ def suite():
-     alltests = common.unittest.TestSuite()
-     if common.show_memory:
-         # Add a memory report at the beginning
--        alltests.addTest(common.unittest.makeSuite(common.ShowMemTime))
-+        alltests.addTest(common.make_suite(common.ShowMemTime))
-     for name in test_modules:
-         # Unexpectedly, the following code doesn't seem to work anymore
-         # in python 3
-@@ -59,7 +59,7 @@ def suite():
-         alltests.addTest(test_suite())
-         if common.show_memory:
-             # Add a memory report after each test module
--            alltests.addTest(common.unittest.makeSuite(common.ShowMemTime))
-+            alltests.addTest(common.make_suite(common.ShowMemTime))
-     return alltests
- 
- 
-diff --git a/tables/tests/test_tables.py b/tables/tests/test_tables.py
-index 6db8d9c52..113b9e34d 100644
---- a/tables/tests/test_tables.py
-+++ b/tables/tests/test_tables.py
-@@ -6987,127 +6987,127 @@ def suite():
-     # common.heavy = 1  # uncomment this only for testing purposes
- 
-     for n in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(BasicWriteTestCase))
-+        theSuite.addTest(common.make_suite(BasicWriteTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(OldRecordBasicWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(DictWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(NumPyDTWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(RecArrayOneWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(RecArrayTwoWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(RecArrayThreeWriteTestCase))
-+            common.make_suite(OldRecordBasicWriteTestCase))
-+        theSuite.addTest(common.make_suite(DictWriteTestCase))
-+        theSuite.addTest(common.make_suite(NumPyDTWriteTestCase))
-+        theSuite.addTest(common.make_suite(RecArrayOneWriteTestCase))
-+        theSuite.addTest(common.make_suite(RecArrayTwoWriteTestCase))
-+        theSuite.addTest(common.make_suite(RecArrayThreeWriteTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(RecArrayAlignedWriteTestCase))
-+            common.make_suite(RecArrayAlignedWriteTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBloscTablesTestCase))
-+            common.make_suite(CompressBloscTablesTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBlosc2TablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+            common.make_suite(CompressBlosc2TablesTestCase))
-+        theSuite.addTest(common.make_suite(
-             CompressBloscShuffleTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(
-             CompressBlosc2ShuffleTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(
-             CompressBloscBitShuffleTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(
-             CompressBlosc2BitShuffleTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(
-             CompressBloscBloscLZTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+        theSuite.addTest(common.make_suite(
-             CompressBlosc2BloscLZTablesTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBloscLZ4TablesTestCase))
-+            common.make_suite(CompressBloscLZ4TablesTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBlosc2LZ4TablesTestCase))
-+            common.make_suite(CompressBlosc2LZ4TablesTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBloscLZ4HCTablesTestCase))
-+            common.make_suite(CompressBloscLZ4HCTablesTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBlosc2LZ4HCTablesTestCase))
-+            common.make_suite(CompressBlosc2LZ4HCTablesTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBloscSnappyTablesTestCase))
-+            common.make_suite(CompressBloscSnappyTablesTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBloscZlibTablesTestCase))
-+            common.make_suite(CompressBloscZlibTablesTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBlosc2ZlibTablesTestCase))
-+            common.make_suite(CompressBlosc2ZlibTablesTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBloscZstdTablesTestCase))
-+            common.make_suite(CompressBloscZstdTablesTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBlosc2ZstdTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CompressLZOTablesTestCase))
-+            common.make_suite(CompressBlosc2ZstdTablesTestCase))
-+        theSuite.addTest(common.make_suite(CompressLZOTablesTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressLZOShuffleTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CompressZLIBTablesTestCase))
-+            common.make_suite(CompressLZOShuffleTablesTestCase))
-+        theSuite.addTest(common.make_suite(CompressZLIBTablesTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressZLIBShuffleTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Fletcher32TablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(AllFiltersTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CompressTwoTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+            common.make_suite(CompressZLIBShuffleTablesTestCase))
-+        theSuite.addTest(common.make_suite(Fletcher32TablesTestCase))
-+        theSuite.addTest(common.make_suite(AllFiltersTablesTestCase))
-+        theSuite.addTest(common.make_suite(CompressTwoTablesTestCase))
-+        theSuite.addTest(common.make_suite(
-             SizeOnDiskInMemoryPropertyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(NonNestedTableReadTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TableReadByteorderTestCase))
--        theSuite.addTest(common.unittest.makeSuite(IterRangeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(RecArrayRangeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GetColRangeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GetItemTestCase))
--        theSuite.addTest(common.unittest.makeSuite(SetItemTestCase1))
--        theSuite.addTest(common.unittest.makeSuite(SetItemTestCase2))
--        theSuite.addTest(common.unittest.makeSuite(SetItemTestCase3))
--        theSuite.addTest(common.unittest.makeSuite(SetItemTestCase4))
--        theSuite.addTest(common.unittest.makeSuite(UpdateRowTestCase1))
--        theSuite.addTest(common.unittest.makeSuite(UpdateRowTestCase2))
--        theSuite.addTest(common.unittest.makeSuite(UpdateRowTestCase3))
--        theSuite.addTest(common.unittest.makeSuite(UpdateRowTestCase4))
--        theSuite.addTest(common.unittest.makeSuite(RecArrayIO1))
--        theSuite.addTest(common.unittest.makeSuite(RecArrayIO2))
--        theSuite.addTest(common.unittest.makeSuite(OpenCopyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CloseCopyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(AlignedOpenCopyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(AlignedCloseCopyTestCase))
-+        theSuite.addTest(common.make_suite(NonNestedTableReadTestCase))
-+        theSuite.addTest(common.make_suite(TableReadByteorderTestCase))
-+        theSuite.addTest(common.make_suite(IterRangeTestCase))
-+        theSuite.addTest(common.make_suite(RecArrayRangeTestCase))
-+        theSuite.addTest(common.make_suite(GetColRangeTestCase))
-+        theSuite.addTest(common.make_suite(GetItemTestCase))
-+        theSuite.addTest(common.make_suite(SetItemTestCase1))
-+        theSuite.addTest(common.make_suite(SetItemTestCase2))
-+        theSuite.addTest(common.make_suite(SetItemTestCase3))
-+        theSuite.addTest(common.make_suite(SetItemTestCase4))
-+        theSuite.addTest(common.make_suite(UpdateRowTestCase1))
-+        theSuite.addTest(common.make_suite(UpdateRowTestCase2))
-+        theSuite.addTest(common.make_suite(UpdateRowTestCase3))
-+        theSuite.addTest(common.make_suite(UpdateRowTestCase4))
-+        theSuite.addTest(common.make_suite(RecArrayIO1))
-+        theSuite.addTest(common.make_suite(RecArrayIO2))
-+        theSuite.addTest(common.make_suite(OpenCopyTestCase))
-+        theSuite.addTest(common.make_suite(CloseCopyTestCase))
-+        theSuite.addTest(common.make_suite(AlignedOpenCopyTestCase))
-+        theSuite.addTest(common.make_suite(AlignedCloseCopyTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(AlignedNoPaddingOpenCopyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex1TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex2TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex3TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex4TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex5TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex6TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex7TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex8TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex9TestCase))
--        theSuite.addTest(common.unittest.makeSuite(DefaultValues))
--        theSuite.addTest(common.unittest.makeSuite(OldRecordDefaultValues))
--        theSuite.addTest(common.unittest.makeSuite(Length1TestCase))
--        theSuite.addTest(common.unittest.makeSuite(Length2TestCase))
--        theSuite.addTest(common.unittest.makeSuite(WhereAppendTestCase))
--        theSuite.addTest(common.unittest.makeSuite(DerivedTableTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ChunkshapeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ZeroSizedTestCase))
--        theSuite.addTest(common.unittest.makeSuite(IrregularStrideTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Issue262TestCase))
--        theSuite.addTest(common.unittest.makeSuite(TruncateOpen1))
--        theSuite.addTest(common.unittest.makeSuite(TruncateOpen2))
--        theSuite.addTest(common.unittest.makeSuite(TruncateClose1))
--        theSuite.addTest(common.unittest.makeSuite(TruncateClose2))
--        theSuite.addTest(common.unittest.makeSuite(PointSelectionTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MDLargeColNoReopen))
--        theSuite.addTest(common.unittest.makeSuite(MDLargeColReopen))
--        theSuite.addTest(common.unittest.makeSuite(ExhaustedIter))
--        theSuite.addTest(common.unittest.makeSuite(SpecialColnamesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(RowContainsTestCase))
--        theSuite.addTest(common.unittest.makeSuite(AccessClosedTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ColumnIterationTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TestCreateTableArgs))
--        theSuite.addTest(common.unittest.makeSuite(TestCreateTableColumnAttrs))
-+            common.make_suite(AlignedNoPaddingOpenCopyTestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex1TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex2TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex3TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex4TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex5TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex6TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex7TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex8TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex9TestCase))
-+        theSuite.addTest(common.make_suite(DefaultValues))
-+        theSuite.addTest(common.make_suite(OldRecordDefaultValues))
-+        theSuite.addTest(common.make_suite(Length1TestCase))
-+        theSuite.addTest(common.make_suite(Length2TestCase))
-+        theSuite.addTest(common.make_suite(WhereAppendTestCase))
-+        theSuite.addTest(common.make_suite(DerivedTableTestCase))
-+        theSuite.addTest(common.make_suite(ChunkshapeTestCase))
-+        theSuite.addTest(common.make_suite(ZeroSizedTestCase))
-+        theSuite.addTest(common.make_suite(IrregularStrideTestCase))
-+        theSuite.addTest(common.make_suite(Issue262TestCase))
-+        theSuite.addTest(common.make_suite(TruncateOpen1))
-+        theSuite.addTest(common.make_suite(TruncateOpen2))
-+        theSuite.addTest(common.make_suite(TruncateClose1))
-+        theSuite.addTest(common.make_suite(TruncateClose2))
-+        theSuite.addTest(common.make_suite(PointSelectionTestCase))
-+        theSuite.addTest(common.make_suite(MDLargeColNoReopen))
-+        theSuite.addTest(common.make_suite(MDLargeColReopen))
-+        theSuite.addTest(common.make_suite(ExhaustedIter))
-+        theSuite.addTest(common.make_suite(SpecialColnamesTestCase))
-+        theSuite.addTest(common.make_suite(RowContainsTestCase))
-+        theSuite.addTest(common.make_suite(AccessClosedTestCase))
-+        theSuite.addTest(common.make_suite(ColumnIterationTestCase))
-+        theSuite.addTest(common.make_suite(TestCreateTableArgs))
-+        theSuite.addTest(common.make_suite(TestCreateTableColumnAttrs))
- 
-     if common.heavy:
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBzip2TablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(
-+            common.make_suite(CompressBzip2TablesTestCase))
-+        theSuite.addTest(common.make_suite(
-             CompressBzip2ShuffleTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex10TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex11TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex12TestCase))
--        theSuite.addTest(common.unittest.makeSuite(LargeRowSize))
--        theSuite.addTest(common.unittest.makeSuite(BigTablesTestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex10TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex11TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex12TestCase))
-+        theSuite.addTest(common.make_suite(LargeRowSize))
-+        theSuite.addTest(common.make_suite(BigTablesTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_tablesMD.py b/tables/tests/test_tablesMD.py
-index 21c2d5576..cc09ed90b 100644
---- a/tables/tests/test_tablesMD.py
-+++ b/tables/tests/test_tablesMD.py
-@@ -2209,39 +2209,39 @@ def suite():
-     # common.heavy = 1  # Uncomment this only for testing purposes
- 
-     for n in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(BasicWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(DictWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(RecordDTWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(NumPyDTWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(RecArrayOneWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(RecArrayTwoWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(RecArrayThreeWriteTestCase))
-+        theSuite.addTest(common.make_suite(BasicWriteTestCase))
-+        theSuite.addTest(common.make_suite(DictWriteTestCase))
-+        theSuite.addTest(common.make_suite(RecordDTWriteTestCase))
-+        theSuite.addTest(common.make_suite(NumPyDTWriteTestCase))
-+        theSuite.addTest(common.make_suite(RecArrayOneWriteTestCase))
-+        theSuite.addTest(common.make_suite(RecArrayTwoWriteTestCase))
-+        theSuite.addTest(common.make_suite(RecArrayThreeWriteTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(RecArrayAlignedWriteTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CompressZLIBTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CompressTwoTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(IterRangeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(RecArrayRangeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GetColRangeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(DefaultValues))
--        theSuite.addTest(common.unittest.makeSuite(RecArrayIO))
--        theSuite.addTest(common.unittest.makeSuite(ShapeTestCase1))
--        theSuite.addTest(common.unittest.makeSuite(ShapeTestCase2))
--        theSuite.addTest(common.unittest.makeSuite(SetItemTestCase1))
--        theSuite.addTest(common.unittest.makeSuite(SetItemTestCase2))
--        theSuite.addTest(common.unittest.makeSuite(SetItemTestCase3))
--        theSuite.addTest(common.unittest.makeSuite(SetItemTestCase4))
--        theSuite.addTest(common.unittest.makeSuite(UpdateRowTestCase1))
--        theSuite.addTest(common.unittest.makeSuite(UpdateRowTestCase2))
--        theSuite.addTest(common.unittest.makeSuite(UpdateRowTestCase3))
--        theSuite.addTest(common.unittest.makeSuite(UpdateRowTestCase4))
-+            common.make_suite(RecArrayAlignedWriteTestCase))
-+        theSuite.addTest(common.make_suite(CompressZLIBTablesTestCase))
-+        theSuite.addTest(common.make_suite(CompressTwoTablesTestCase))
-+        theSuite.addTest(common.make_suite(IterRangeTestCase))
-+        theSuite.addTest(common.make_suite(RecArrayRangeTestCase))
-+        theSuite.addTest(common.make_suite(GetColRangeTestCase))
-+        theSuite.addTest(common.make_suite(DefaultValues))
-+        theSuite.addTest(common.make_suite(RecArrayIO))
-+        theSuite.addTest(common.make_suite(ShapeTestCase1))
-+        theSuite.addTest(common.make_suite(ShapeTestCase2))
-+        theSuite.addTest(common.make_suite(SetItemTestCase1))
-+        theSuite.addTest(common.make_suite(SetItemTestCase2))
-+        theSuite.addTest(common.make_suite(SetItemTestCase3))
-+        theSuite.addTest(common.make_suite(SetItemTestCase4))
-+        theSuite.addTest(common.make_suite(UpdateRowTestCase1))
-+        theSuite.addTest(common.make_suite(UpdateRowTestCase2))
-+        theSuite.addTest(common.make_suite(UpdateRowTestCase3))
-+        theSuite.addTest(common.make_suite(UpdateRowTestCase4))
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBloscTablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CompressLZOTablesTestCase))
-+            common.make_suite(CompressBloscTablesTestCase))
-+        theSuite.addTest(common.make_suite(CompressLZOTablesTestCase))
-     if common.heavy:
-         theSuite.addTest(
--            common.unittest.makeSuite(CompressBzip2TablesTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BigTablesTestCase))
-+            common.make_suite(CompressBzip2TablesTestCase))
-+        theSuite.addTest(common.make_suite(BigTablesTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_timestamps.py b/tables/tests/test_timestamps.py
-index 1d4528c1c..60c9c56c1 100644
---- a/tables/tests/test_timestamps.py
-+++ b/tables/tests/test_timestamps.py
-@@ -160,8 +160,8 @@ def suite():
-     # common.heavy = 1 # Uncomment this only for testing purposes!
- 
-     for i in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(TimestampTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BitForBitTestCase))
-+        theSuite.addTest(common.make_suite(TimestampTestCase))
-+        theSuite.addTest(common.make_suite(BitForBitTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_timetype.py b/tables/tests/test_timetype.py
-index d8ac3b189..d6db8fd3f 100644
---- a/tables/tests/test_timetype.py
-+++ b/tables/tests/test_timetype.py
-@@ -510,11 +510,11 @@ def suite():
- 
-     theSuite = common.unittest.TestSuite()
- 
--    theSuite.addTest(common.unittest.makeSuite(LeafCreationTestCase))
--    theSuite.addTest(common.unittest.makeSuite(OpenTestCase))
--    theSuite.addTest(common.unittest.makeSuite(CompareTestCase))
--    theSuite.addTest(common.unittest.makeSuite(UnalignedTestCase))
--    theSuite.addTest(common.unittest.makeSuite(BigEndianTestCase))
-+    theSuite.addTest(common.make_suite(LeafCreationTestCase))
-+    theSuite.addTest(common.make_suite(OpenTestCase))
-+    theSuite.addTest(common.make_suite(CompareTestCase))
-+    theSuite.addTest(common.make_suite(UnalignedTestCase))
-+    theSuite.addTest(common.make_suite(BigEndianTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_tree.py b/tables/tests/test_tree.py
-index d38e0d472..07a463eb1 100644
---- a/tables/tests/test_tree.py
-+++ b/tables/tests/test_tree.py
-@@ -1092,11 +1092,11 @@ def suite():
-     niter = 1
- 
-     for i in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(TreeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(DeepTreeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(WideTreeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(HiddenTreeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CreateParentsTestCase))
-+        theSuite.addTest(common.make_suite(TreeTestCase))
-+        theSuite.addTest(common.make_suite(DeepTreeTestCase))
-+        theSuite.addTest(common.make_suite(WideTreeTestCase))
-+        theSuite.addTest(common.make_suite(HiddenTreeTestCase))
-+        theSuite.addTest(common.make_suite(CreateParentsTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_types.py b/tables/tests/test_types.py
-index 8da3447fa..e2bb52160 100644
---- a/tables/tests/test_types.py
-+++ b/tables/tests/test_types.py
-@@ -315,10 +315,10 @@ def suite():
-         # doctests. When only numpy 2 is supported re-enable these tests.
-         if parse_version(np.__version__) < parse_version("2.dev0"):
-             theSuite.addTest(doctest.DocTestSuite(tb.atom))
--        theSuite.addTest(common.unittest.makeSuite(AtomTestCase))
--        theSuite.addTest(common.unittest.makeSuite(RangeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(DtypeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ReadFloatTestCase))
-+        theSuite.addTest(common.make_suite(AtomTestCase))
-+        theSuite.addTest(common.make_suite(RangeTestCase))
-+        theSuite.addTest(common.make_suite(DtypeTestCase))
-+        theSuite.addTest(common.make_suite(ReadFloatTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_utils.py b/tables/tests/test_utils.py
-index 3c541f6e1..904b9d5bd 100644
---- a/tables/tests/test_utils.py
-+++ b/tables/tests/test_utils.py
-@@ -81,9 +81,9 @@ def test_paths_windows(self, _, mock_get_tree_str, mock_open_file):
- def suite():
-     theSuite = common.unittest.TestSuite()
- 
--    theSuite.addTest(common.unittest.makeSuite(ptrepackTestCase))
--    theSuite.addTest(common.unittest.makeSuite(ptdumpTestCase))
--    theSuite.addTest(common.unittest.makeSuite(pttreeTestCase))
-+    theSuite.addTest(common.make_suite(ptrepackTestCase))
-+    theSuite.addTest(common.make_suite(ptdumpTestCase))
-+    theSuite.addTest(common.make_suite(pttreeTestCase))
- 
-     return theSuite
- 
-diff --git a/tables/tests/test_vlarray.py b/tables/tests/test_vlarray.py
-index 19ab6ebd3..6d08183db 100644
---- a/tables/tests/test_vlarray.py
-+++ b/tables/tests/test_vlarray.py
-@@ -4352,56 +4352,56 @@ def suite():
-     niter = 1
- 
-     for n in range(niter):
--        theSuite.addTest(common.unittest.makeSuite(BasicNumPyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BasicPythonTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ZlibComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscShuffleComprTestCase))
-+        theSuite.addTest(common.make_suite(BasicNumPyTestCase))
-+        theSuite.addTest(common.make_suite(BasicPythonTestCase))
-+        theSuite.addTest(common.make_suite(ZlibComprTestCase))
-+        theSuite.addTest(common.make_suite(BloscComprTestCase))
-+        theSuite.addTest(common.make_suite(BloscShuffleComprTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(BloscBitShuffleComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscBloscLZComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscLZ4ComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscLZ4HCComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscSnappyComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscZlibComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(BloscZstdComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(LZOComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(Bzip2ComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TypesReopenTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TypesNoReopenTestCase))
--        theSuite.addTest(common.unittest.makeSuite(MDTypesNumPyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(OpenAppendShapeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CloseAppendShapeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(PythonFlavorTestCase))
--        theSuite.addTest(common.unittest.makeSuite(NumPyFlavorTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ReadRangeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(GetItemRangeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(SetRangeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(ShuffleComprTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CloseCopyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(OpenCopyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex1TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex2TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex3TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex4TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex5TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex6TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex7TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex8TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex9TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex10TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex11TestCase))
--        theSuite.addTest(common.unittest.makeSuite(CopyIndex12TestCase))
--        theSuite.addTest(common.unittest.makeSuite(ChunkshapeTestCase))
--        theSuite.addTest(common.unittest.makeSuite(VLUEndianTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TruncateOpenTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TruncateCloseTestCase))
--        theSuite.addTest(common.unittest.makeSuite(PointSelectionTestCase))
-+            common.make_suite(BloscBitShuffleComprTestCase))
-+        theSuite.addTest(common.make_suite(BloscBloscLZComprTestCase))
-+        theSuite.addTest(common.make_suite(BloscLZ4ComprTestCase))
-+        theSuite.addTest(common.make_suite(BloscLZ4HCComprTestCase))
-+        theSuite.addTest(common.make_suite(BloscSnappyComprTestCase))
-+        theSuite.addTest(common.make_suite(BloscZlibComprTestCase))
-+        theSuite.addTest(common.make_suite(BloscZstdComprTestCase))
-+        theSuite.addTest(common.make_suite(LZOComprTestCase))
-+        theSuite.addTest(common.make_suite(Bzip2ComprTestCase))
-+        theSuite.addTest(common.make_suite(TypesReopenTestCase))
-+        theSuite.addTest(common.make_suite(TypesNoReopenTestCase))
-+        theSuite.addTest(common.make_suite(MDTypesNumPyTestCase))
-+        theSuite.addTest(common.make_suite(OpenAppendShapeTestCase))
-+        theSuite.addTest(common.make_suite(CloseAppendShapeTestCase))
-+        theSuite.addTest(common.make_suite(PythonFlavorTestCase))
-+        theSuite.addTest(common.make_suite(NumPyFlavorTestCase))
-+        theSuite.addTest(common.make_suite(ReadRangeTestCase))
-+        theSuite.addTest(common.make_suite(GetItemRangeTestCase))
-+        theSuite.addTest(common.make_suite(SetRangeTestCase))
-+        theSuite.addTest(common.make_suite(ShuffleComprTestCase))
-+        theSuite.addTest(common.make_suite(CloseCopyTestCase))
-+        theSuite.addTest(common.make_suite(OpenCopyTestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex1TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex2TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex3TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex4TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex5TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex6TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex7TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex8TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex9TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex10TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex11TestCase))
-+        theSuite.addTest(common.make_suite(CopyIndex12TestCase))
-+        theSuite.addTest(common.make_suite(ChunkshapeTestCase))
-+        theSuite.addTest(common.make_suite(VLUEndianTestCase))
-+        theSuite.addTest(common.make_suite(TruncateOpenTestCase))
-+        theSuite.addTest(common.make_suite(TruncateCloseTestCase))
-+        theSuite.addTest(common.make_suite(PointSelectionTestCase))
-         theSuite.addTest(
--            common.unittest.makeSuite(SizeInMemoryPropertyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(SizeOnDiskPropertyTestCase))
--        theSuite.addTest(common.unittest.makeSuite(AccessClosedTestCase))
--        theSuite.addTest(common.unittest.makeSuite(TestCreateVLArrayArgs))
-+            common.make_suite(SizeInMemoryPropertyTestCase))
-+        theSuite.addTest(common.make_suite(SizeOnDiskPropertyTestCase))
-+        theSuite.addTest(common.make_suite(AccessClosedTestCase))
-+        theSuite.addTest(common.make_suite(TestCreateVLArrayArgs))
- 
-     return theSuite
- 
diff --git a/python-tables.spec b/python-tables.spec
index 128097f..a59a465 100644
--- a/python-tables.spec
+++ b/python-tables.spec
@@ -6,7 +6,7 @@
 
 Summary:        HDF5 support in Python
 Name:           python-tables
-Version:        3.9.2
+Version:        3.10.0
 Release:        %autorelease
 #Source0:        https://github.com/PyTables/PyTables/archive/%{commit}/PyTables-%{commit}.tar.gz
 Source0:        https://github.com/PyTables/PyTables/archive/v%{version}/python-tables-%{version}.tar.gz
@@ -20,10 +20,6 @@ Source1:        https://github.com/PyTables/PyTables/releases/download/v%{manual
 
 # https://github.com/PyTables/PyTables/issues/735
 Patch1:         0001-Skip-tests-that-fail-on-s390x.patch
-# Fix compatibility with Python v3.13 - unittest.makeSuite() is not available
-Patch2:         https://github.com/PyTables/PyTables/commit/4a1b480e7e37.patch
-# Make tables.tests.common.make_suite() accept the prefix argument (fixup for the above)
-Patch3:         https://github.com/PyTables/PyTables/commit/424784895b0f.patch
 
 License:        BSD
 URL:            https://www.pytables.org
@@ -40,6 +36,7 @@ BuildRequires:  python%{python3_pkgversion}-Cython >= 0.13
 BuildRequires:  python%{python3_pkgversion}-numpy
 BuildRequires:  python%{python3_pkgversion}-numexpr >= 2.4
 BuildRequires:  python%{python3_pkgversion}-six
+BuildRequires:  python%{python3_pkgversion}-typing-extensions
 
 ExcludeArch:    %{ix86}
 
diff --git a/sources b/sources
index 8462fa7..9efa9c9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (python-tables-3.9.2.tar.gz) = bd0e97727dfa77d93625c1d335f24c8ee7ae06d38c8d4a104e4a7fc750e21d2a64988ca053059a747e5b38d1ead13313424b8a5d896af047e08a12cba89d49e5
+SHA512 (python-tables-3.10.0.tar.gz) = 10f7b32c75e15d38e9614420ba02ecef4562f4ae59ec974c079e5850263c814e3e3d4dc54951693a5a9e67c39a949b3a732753e36f7fad80bd3dff0fcd1f547d
 SHA512 (pytablesmanual-3.3.0.pdf) = beb068a301e20370fdab9f942bed271b94872f409087cba8f7127967a51e45a233d8e6df1aaa12aad532282aec324b0c823b1646be31a5b71e5e7c035ba06270