diff --git a/addons/web/tests/common.py b/addons/web/tests/common.py
index ef0ad0987c7..a4b9348f8c3 100644
--- a/addons/web/tests/common.py
+++ b/addons/web/tests/common.py
@@ -8,10 +8,10 @@ from openerp import http
 class MockRequestCase(unittest2.TestCase):
     def setUp(self):
         super(MockRequestCase, self).setUp()
-        self.tmp_req = http.set_request(mock.Mock())
-        self.tmp_req.__enter__()
+        self.tmp_req = mock.Mock()
+        http._request_stack.push(self.tmp_req)
 
     def tearDown(self):
-        self.tmp_req.__exit__(None, None, None)
+        http._request_stack.pop()
         super(MockRequestCase, self).tearDown()