diff --git a/product/ERP5Type/tests/ERP5TypeLiveTestCase.py b/product/ERP5Type/tests/ERP5TypeLiveTestCase.py
index 192edcc511382fdfc4dc14971fa15a138e912997..f97f5481b0befddd53a692be109ac3c29eafb624 100644
--- a/product/ERP5Type/tests/ERP5TypeLiveTestCase.py
+++ b/product/ERP5Type/tests/ERP5TypeLiveTestCase.py
@@ -470,8 +470,11 @@ def runLiveTest(test_list, verbosity=1, stream=None, **kw):
   loader = ERP5TypeTestLoader()
   run_only = kw.get('run_only', None)
   if run_only is not None:
-    loader.filter_test_list = [re.compile(x).search for x in run_only.split(',')]
+    ERP5TypeTestLoader.filter_test_list = \
+        [re.compile(x).search for x in run_only.split(',')]
   suite = loader.loadTestsFromNames(test_list)
+  if run_only is not None:
+    ERP5TypeTestLoader.filter_test_list = None
   output = stream
   if stream is None:
     output = StringIO()
diff --git a/product/ERP5Type/tests/runUnitTest.py b/product/ERP5Type/tests/runUnitTest.py
index 760f29daaba03f1ae878f8022e00b6d725b88b68..68d445c8c1ed16cb9064761c458a296257dc6f6e 100755
--- a/product/ERP5Type/tests/runUnitTest.py
+++ b/product/ERP5Type/tests/runUnitTest.py
@@ -508,10 +508,12 @@ def runUnitTestList(test_list, verbosity=1, debug=0, run_only=None):
         TestRunner = DebugTextTestRunner
       loader = ERP5TypeTestLoader()
       if run_only:
-        loader.filter_test_list = [re.compile(x).search for x in
+        ERP5TypeTestLoader.filter_test_list = [re.compile(x).search for x in
             run_only.split(',')]
 
       suite = loader.loadTestsFromNames(test_list)
+      if run_only:
+        ERP5TypeTestLoader.filter_test_list = None
 
     if not isinstance(Storage, ClientStorage):
       # Remove nodes that were registered during previous execution.