diff --git a/product/ERP5Type/tests/ERP5TypeTestCase.py b/product/ERP5Type/tests/ERP5TypeTestCase.py
index 5ffda3c3ff15afb772f2f12ede9829f1a9d16907..b343872a77df6b050e6c0f83064ed2b5726489d8 100644
--- a/product/ERP5Type/tests/ERP5TypeTestCase.py
+++ b/product/ERP5Type/tests/ERP5TypeTestCase.py
@@ -701,6 +701,11 @@ def setupERP5Site( business_template_list=(),
                           % title) # run_unit_test depends on this string.
       raise
 
+from unittest import _makeLoader, TestSuite
+
+def dummy_makeSuite(testCaseClass, prefix='dummy_test', sortUsing=cmp, suiteClass=TestSuite):
+  return _makeLoader(prefix, sortUsing, suiteClass).loadTestsFromTestCase(testCaseClass)
+
 def dummy_setUp(self):
   '''
   This one is overloaded so that it dos not execute beforeSetUp and afterSetUp
diff --git a/product/ERP5Type/tests/runUnitTest.py b/product/ERP5Type/tests/runUnitTest.py
index 3bae853dcb354ca6c46e3f04f7f0624c88c26309..4c94240b7f8a9e5ea00a810aa0802bce2548d14c 100755
--- a/product/ERP5Type/tests/runUnitTest.py
+++ b/product/ERP5Type/tests/runUnitTest.py
@@ -232,12 +232,15 @@ def runUnitTestList(test_list) :
 
   save = 0
   # pass save=1 to test loader to skip all tests in save mode
-  # and monkeypatch PortalTestCase.setUp to skip beforeSetUp and afterSetUp
+  # and monkeypatch PortalTestCase.setUp to skip beforeSetUp and afterSetUp.
+  # Also patch unittest.makeSuite, as it's used in test_suite function in 
+  # test cases.
   if os.environ.get('erp5_save_data_fs'):
     from Products.ERP5Type.tests.ERP5TypeTestCase import \
-                             dummy_setUp, dummy_tearDown
+                  dummy_makeSuite, dummy_setUp, dummy_tearDown
     save = 1
     from Testing.ZopeTestCase.PortalTestCase import PortalTestCase
+    unittest.makeSuite = dummy_makeSuite
     PortalTestCase.setUp = dummy_setUp
     PortalTestCase.tearDown = dummy_tearDown