diff --git a/__unported__/web_context_tunnel/__init__.py b/web_context_tunnel/__init__.py
similarity index 100%
rename from __unported__/web_context_tunnel/__init__.py
rename to web_context_tunnel/__init__.py
diff --git a/__unported__/web_context_tunnel/__openerp__.py b/web_context_tunnel/__openerp__.py
similarity index 96%
rename from __unported__/web_context_tunnel/__openerp__.py
rename to web_context_tunnel/__openerp__.py
index ba2616bea..ff5741f20 100644
--- a/__unported__/web_context_tunnel/__openerp__.py
+++ b/web_context_tunnel/__openerp__.py
@@ -68,7 +68,7 @@ Tests
 This module comes with a simple test in static/test/context_tunnel.js.
 To run it, open the page /web/tests?mod=web_context_tunnel in your browser
 as explained here https://doc.openerp.com/trunk/web/testing
-It should also by picked by the Python testing when testing with PhantomJS.
+It should also be picked by the Python testing when testing with PhantomJS.
 
 As for testing modules using web_context_tunnel with YAML, yes it's possible.
 In fact you need to manually mimic the new web-client behavior by manually
@@ -82,12 +82,13 @@ https://github.com/openerpbrasil/l10n_br_core/compare/develop...feature%2Fsale-w
 """,
     'version': '2.0',
     'depends': ['web'],
-    'js': ['static/src/js/context_tunnel.js'],
+    'data': [
+        'views/web_context_tunnel.xml',
+    ],
     'test': [
         'static/test/context_tunnel.js',
     ],
     'css': [],
     'auto_install': False,
-    'installable': False,
     'web_preload': False,
 }
diff --git a/__unported__/web_context_tunnel/i18n/web_context_tunnel.pot b/web_context_tunnel/i18n/web_context_tunnel.pot
similarity index 100%
rename from __unported__/web_context_tunnel/i18n/web_context_tunnel.pot
rename to web_context_tunnel/i18n/web_context_tunnel.pot
diff --git a/__unported__/web_context_tunnel/static/src/js/context_tunnel.js b/web_context_tunnel/static/src/js/context_tunnel.js
similarity index 97%
rename from __unported__/web_context_tunnel/static/src/js/context_tunnel.js
rename to web_context_tunnel/static/src/js/context_tunnel.js
index aab1d5acd..699b84e36 100644
--- a/__unported__/web_context_tunnel/static/src/js/context_tunnel.js
+++ b/web_context_tunnel/static/src/js/context_tunnel.js
@@ -22,6 +22,3 @@ openerp.web_context_tunnel = function(instance) {
         return v_context;
     };
 };
-
-
-// vim:et fdc=0 fdl=0:
diff --git a/__unported__/web_context_tunnel/static/test/context_tunnel.js b/web_context_tunnel/static/test/context_tunnel.js
similarity index 87%
rename from __unported__/web_context_tunnel/static/test/context_tunnel.js
rename to web_context_tunnel/static/test/context_tunnel.js
index f0fab997c..7dbe16575 100644
--- a/__unported__/web_context_tunnel/static/test/context_tunnel.js
+++ b/web_context_tunnel/static/test/context_tunnel.js
@@ -1,7 +1,9 @@
 openerp.testing.section('context_tunnel', {
+    dependencies: ['web.list', 'web.form'],
+    templates: true
 }, function (test) {
-    test.dependencies = window['oe_all_dependencies'];
     test("context composition", function (instance) {
+        new openerp.web_context_tunnel(instance);
         var field_manager = new instance.web.form.DefaultFieldManager();
         var node = {'attrs': {'context': {'key1': 'value1', 'key2': 'value2'}, 'context_2': {'key3': 'value3'}, 'context_3': {'key4': 'value4'}}}
         var w = new instance.web.form.FormWidget(field_manager, node);
diff --git a/web_context_tunnel/views/web_context_tunnel.xml b/web_context_tunnel/views/web_context_tunnel.xml
new file mode 100644
index 000000000..983b664de
--- /dev/null
+++ b/web_context_tunnel/views/web_context_tunnel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<openerp>
+    <data>
+        <template id="assets_backend" name="web_context_tunnel assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/web_context_tunnel/static/src/js/context_tunnel.js"></script>
+            </xpath>
+        </template>
+        <template id="qunit_suite" name="web_context_tunnel qunit" inherit_id="web.qunit_suite">
+            <xpath expr="//head" position="inside">
+                <script type="text/javascript" src="/web_context_tunnel/static/test/context_tunnel.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>