diff --git a/addons/base/static/lib/qweb/qweb-test.js.html b/addons/base/static/lib/qweb/qweb-test.js.html
index 4474b6ac542..b39527f0c13 100644
--- a/addons/base/static/lib/qweb/qweb-test.js.html
+++ b/addons/base/static/lib/qweb/qweb-test.js.html
@@ -8,6 +8,7 @@
     <script type="text/javascript" src="qweb2.js"></script>
 
     <script>
+        QWeb = new QWeb2.Engine();
         function trim(s) {
             return s.replace(/(^\s+|\s+$)/g, '');
         }
diff --git a/addons/base/static/lib/qweb/qweb2.js b/addons/base/static/lib/qweb/qweb2.js
index fb4ad42bca9..18e38c30c52 100644
--- a/addons/base/static/lib/qweb/qweb2.js
+++ b/addons/base/static/lib/qweb/qweb2.js
@@ -560,5 +560,3 @@ QWeb2.Element = (function() {
     });
     return Element;
 })();
-
-QWeb = new QWeb2.Engine();
diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html
index 27c83aef380..93e95d32534 100644
--- a/addons/base/static/src/base.html
+++ b/addons/base/static/src/base.html
@@ -8,7 +8,10 @@
     <script type="text/javascript" src="/base/static/lib/LABjs/LAB.js"></script>
     <script type="text/javascript" src="/base/static/lib/underscore/underscore.js"></script>
     <script type="text/javascript" src="/base/static/lib/underscore/underscore.strings.js"></script>
+    <script type="text/javascript" src="/base/static/lib/qweb/qweb2.js"></script>
+    <!-- Uncomment in order to use legacy QWeb
     <script type="text/javascript" src="/base/static/lib/qweb/qweb.js"></script>
+    -->
     <script type="text/javascript" src="/base/static/lib/jquery/jquery-1.5.2.js"></script>
     <script type="text/javascript" src="/base/static/lib/jquery.ui/js/jquery-ui-1.8.9.custom.min.js"></script>
     <script type="text/javascript" src="/base/static/lib/jquery.ui/js/jquery-ui-timepicker-addon.js"></script>
@@ -34,6 +37,7 @@
 
     <script type="text/javascript">
         $(function() {
+            QWeb = window.QWeb || new QWeb2.Engine();
             var oe = openerp.init();
             oe.base.webclient("oe");
         });