diff --git a/openerp/addons/base/ir/ir_qweb/ir_qweb.py b/openerp/addons/base/ir/ir_qweb/ir_qweb.py
index 3f617637426..166858edd2c 100644
--- a/openerp/addons/base/ir/ir_qweb/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb/ir_qweb.py
@@ -157,8 +157,7 @@ class IrQWeb(models.AbstractModel, QWeb):
 
     @tools.ormcache('xmlid', 'options.get("lang", "en_US")')
     def _get_asset_content(self, xmlid, options):
-        options = dict(self.env.context)
-        options.update(options,
+        options = dict(options,
             inherit_branding=False, inherit_branding_auto=False,
             edit_translations=False, translatable=False,
             rendering_bundle=True)
diff --git a/openerp/addons/test_assetsbundle/tests/test_assetsbundle.py b/openerp/addons/test_assetsbundle/tests/test_assetsbundle.py
index f4e95368b15..183100ebedd 100644
--- a/openerp/addons/test_assetsbundle/tests/test_assetsbundle.py
+++ b/openerp/addons/test_assetsbundle/tests/test_assetsbundle.py
@@ -20,7 +20,7 @@ class TestJavascriptAssetsBundle(TransactionCase):
 
     def _get_asset(self, xmlid, env=None):
         env = (env or self.env)
-        files, remains = env['ir.qweb']._get_asset_content(xmlid, {})
+        files, remains = env['ir.qweb']._get_asset_content(xmlid, env.context)
         return AssetsBundle(xmlid, files, remains, env=env)
 
     def _any_ira_for_bundle(self, type):