diff --git a/openerp/addons/base/tests/test_acl.py b/openerp/addons/base/tests/test_acl.py
index 9f6be133947..366a1712978 100644
--- a/openerp/addons/base/tests/test_acl.py
+++ b/openerp/addons/base/tests/test_acl.py
@@ -111,10 +111,12 @@ class TestACL(common.TransactionCase):
         # accessing fields must no raise exceptions...
         part.name
         # ... except if they are restricted
-        with self.assertRaises(openerp.exceptions.AccessError):
+        with self.assertRaises(openerp.osv.orm.except_orm) as cm:
             with mute_logger('openerp.models'):
                 part.email
 
+        self.assertEqual(cm.exception.args[0], 'AccessError')
+
 if __name__ == '__main__':
     unittest2.main()
 
diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index db84855b36a..f058436ad33 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -108,9 +108,9 @@ class BaseCase(unittest2.TestCase):
     @contextmanager
     def _assertRaises(self, exception):
         """ Context manager that clears the environment upon failure. """
-        with super(BaseCase, self).assertRaises(exception):
+        with super(BaseCase, self).assertRaises(exception) as cm:
             with self.env.clear_upon_failure():
-                yield
+                yield cm
 
     def assertRaises(self, exception, func=None, *args, **kwargs):
         if func: