diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 3f0143ef9df..4e72b6c5fd6 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -94,9 +94,10 @@ class TransactionCase(BaseCase):
         TransactionCase.cr = self.cursor()
         TransactionCase.uid = openerp.SUPERUSER_ID
 
-    def tearDown(self):
-        self.cr.rollback()
-        self.cr.close()
+        @self.addCleanup
+        def close_cursor():
+            self.cr.rollback()
+            self.cr.close()
 
 
 class SingleTransactionCase(BaseCase):