diff --git a/bt5/vifib_open_trade/TestTemplateItem/ViFiBOrderTest.py b/bt5/vifib_open_trade/TestTemplateItem/ViFiBOrderTest.py
index 58e26753aedbd4ef0355dd1ea53d360700eb12e0..41b535017b1d18079441a2b1be95e292b4ddcf42 100644
--- a/bt5/vifib_open_trade/TestTemplateItem/ViFiBOrderTest.py
+++ b/bt5/vifib_open_trade/TestTemplateItem/ViFiBOrderTest.py
@@ -132,11 +132,14 @@ class ViFiBOrderTest(ERP5TypeLiveTestCase):
     # XXX
     #self.login('jp')    
 
-  def beforeClear(self):
-    """This method should be moved up to ERP5TypeLiveTestCase
-    or to a subclass of it
-    """
-    self.cleanupGarbage()
+  #def beforeClear(self):
+  #  """This method should be moved up to ERP5TypeLiveTestCase
+  #  or to a subclass of it
+  #
+  #  XXX beforeClear was removed from ERP5TypeLiveTestCase
+  #  XXX when should should cleanupGarbage be called ?
+  #  """
+  #  self.cleanupGarbage()
 
   def collectGarbage(self, document):
     """Keeps a list of documents to erase at the end of the test
diff --git a/bt5/vifib_open_trade/bt/revision b/bt5/vifib_open_trade/bt/revision
index 8c0474e3239fc7c1a693d29caba0c85b872b6c1d..d7765fe47e06ccb3e29a916d2f5ede6d3ac0c533 100644
--- a/bt5/vifib_open_trade/bt/revision
+++ b/bt5/vifib_open_trade/bt/revision
@@ -1 +1 @@
-69
\ No newline at end of file
+70
\ No newline at end of file
diff --git a/product/ERP5Type/tests/ERP5TypeLiveTestCase.py b/product/ERP5Type/tests/ERP5TypeLiveTestCase.py
index 8d3bb4296e778cd450c8677d8af74f46bf531bb4..a6309f8f4df4e3e3cf23ecd135a6d92c2b5f80f4 100644
--- a/product/ERP5Type/tests/ERP5TypeLiveTestCase.py
+++ b/product/ERP5Type/tests/ERP5TypeLiveTestCase.py
@@ -118,38 +118,13 @@ class ERP5TypeLiveTestCase(ERP5TypeTestCaseMixin):
         self.portal.portal_activities.unsubscribe()
         self._setUpDummyMailHost()
 
-    def setUp(self):
-        '''Sets up the fixture. Do not override,
-           use the hooks instead.
-        '''
-        try:
-            self.beforeSetUp()
-            self.app = self._app()
-            self.portal = self._portal()
-            self._setup()
-            self.afterSetUp()
-        except:
-            self.beforeClear()
-            self._clear()
-            raise
+    setUp = PortalTestCase.setUp
+    tearDown = PortalTestCase.tearDown
 
     def _app(self):
         '''Returns the app object for a test.'''
         return self.getPortal().aq_parent
 
-    def beforeClear(self):
-      '''Called before _clear(). Subclasses should
-      use it to garbage collect objects which must not remain
-      in the system
-      '''
-      pass
-
-    def tearDown(self):
-      '''Tears down the fixture. Do not override,
-         use the hooks instead.
-      '''
-      PortalTestCase.tearDown(self)
-
 
 def runLiveTest(test_list, verbosity=1, stream=None, **kw):
   from Products.ERP5Type.tests.runUnitTest import DebugTestResult