diff --git a/addons/account/static/src/js/tour.js b/addons/account/static/src/js/tours/account.js
similarity index 100%
rename from addons/account/static/src/js/tour.js
rename to addons/account/static/src/js/tours/account.js
diff --git a/addons/account/static/src/js/reconciliation/tour_reconciliation.js b/addons/account/static/tests/tours/reconciliation.js
similarity index 100%
rename from addons/account/static/src/js/reconciliation/tour_reconciliation.js
rename to addons/account/static/tests/tours/reconciliation.js
diff --git a/addons/account/views/account.xml b/addons/account/views/account.xml
index 837d27235b3..448363ddec2 100644
--- a/addons/account/views/account.xml
+++ b/addons/account/views/account.xml
@@ -20,14 +20,13 @@
             <script type="text/javascript" src="/account/static/src/js/reconciliation/reconciliation_action.js"></script>
             <script type="text/javascript" src="/account/static/src/js/reconciliation/reconciliation_model.js"></script>
             <script type="text/javascript" src="/account/static/src/js/reconciliation/reconciliation_renderer.js"></script>
-            <script type="text/javascript" src="/account/static/src/js/reconciliation/tour_reconciliation.js"></script>
 
             <script type="text/javascript" src="/account/static/src/js/account_payment_field.js"></script>
             <script type="text/javascript" src="/account/static/src/js/mail_activity.js"></script>
 
             <script type="text/javascript" src="/account/static/src/js/bank_statement.js"></script>
             <script type="text/javascript" src="/account/static/src/js/section_and_note_fields_backend.js"></script>
-            <script type="text/javascript" src="/account/static/src/js/tour.js"></script>
+            <script type="text/javascript" src="/account/static/src/js/tours/account.js"></script>
 
             <script type="text/javascript" src="/account/static/src/js/bills_tree_upload.js"/>
         </xpath>
@@ -39,6 +38,12 @@
         </xpath>
     </template>
 
+    <template id="assets_tests" name="Account Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/account/static/tests/tours/reconciliation.js"></script>
+        </xpath>
+    </template>
+
     <template id="qunit_suite" name="account tests" inherit_id="web.qunit_suite">
         <xpath expr="//script[contains(@src, '/web/static/tests/views/kanban_tests.js')]" position="after">
             <script type="text/javascript" src="/account/static/tests/reconciliation_tests.js"></script>
diff --git a/addons/crm/static/src/js/tour.js b/addons/crm/static/src/js/tours/crm.js
similarity index 100%
rename from addons/crm/static/src/js/tour.js
rename to addons/crm/static/src/js/tours/crm.js
diff --git a/addons/crm/views/crm_templates.xml b/addons/crm/views/crm_templates.xml
index b8b2454664d..3f6afab1c9a 100644
--- a/addons/crm/views/crm_templates.xml
+++ b/addons/crm/views/crm_templates.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <template id="assets_backend" name="crm assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" href="/crm/static/src/css/crm.css"/>
-                <script type="text/javascript" src="/crm/static/src/js/tour.js"></script>
-            </xpath>
-        </template>
+    <template id="assets_backend" name="crm assets" inherit_id="web.assets_backend">
+        <xpath expr="." position="inside">
+            <link rel="stylesheet" href="/crm/static/src/css/crm.css"/>
+        </xpath>
+    </template>
+    <template id="assets_tests" name="CRM Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/crm/static/src/js/tours/crm.js"></script>
+        </xpath>
+    </template>
 </odoo>
diff --git a/addons/event_sale/static/src/js/event_configurator_test_ui.js b/addons/event_sale/static/tests/tours/event_configurator_ui.js
similarity index 100%
rename from addons/event_sale/static/src/js/event_configurator_test_ui.js
rename to addons/event_sale/static/tests/tours/event_configurator_ui.js
diff --git a/addons/event_sale/views/assets.xml b/addons/event_sale/views/assets.xml
index beb33301b89..c8341ae97aa 100644
--- a/addons/event_sale/views/assets.xml
+++ b/addons/event_sale/views/assets.xml
@@ -9,7 +9,11 @@
         <script type="text/javascript" src="/event_sale/static/src/js/event_configurator_view.js"></script>
         <script type="text/javascript" src="/event_sale/static/src/js/event_configurator_widget_mixin.js"></script>
         <script type="text/javascript" src="/event_sale/static/src/js/event_configurator_widget.js"></script>
-        <script type="text/javascript" src="/event_sale/static/src/js/event_configurator_test_ui.js"></script>
+    </xpath>
+</template>
+<template id="assets_tests" name="Event Sale Assets Tests" inherit_id="web.assets_tests">
+    <xpath expr="." position="inside">
+        <script type="text/javascript" src="/event_sale/static/tests/tours/event_configurator_ui.js"></script>
     </xpath>
 </template>
 <template id="qunit_suite" inherit_id="web.qunit_suite" name="event_sale_tests">
diff --git a/addons/event_sale_product_configurator/static/src/js/event_configurator_test_ui.js b/addons/event_sale_product_configurator/static/tests/tours/event_configurator_ui.js
similarity index 100%
rename from addons/event_sale_product_configurator/static/src/js/event_configurator_test_ui.js
rename to addons/event_sale_product_configurator/static/tests/tours/event_configurator_ui.js
diff --git a/addons/event_sale_product_configurator/views/assets.xml b/addons/event_sale_product_configurator/views/assets.xml
index 854c674206f..57fdec3fadb 100644
--- a/addons/event_sale_product_configurator/views/assets.xml
+++ b/addons/event_sale_product_configurator/views/assets.xml
@@ -2,8 +2,13 @@
 <odoo>
     <template id="assets_backend" inherit_id="web.assets_backend" name="event_sale_product_configurator assets backend">
         <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/event_sale_product_configurator/static/src/js/event_configurator_test_ui.js"></script>
             <script type="text/javascript" src="/event_sale_product_configurator/static/src/js/product_configurator_widget.js"></script>
         </xpath>
     </template>
+
+    <template id="assets_tests" name="Event Sale Product Configurator Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/event_sale_product_configurator/static/tests/tours/event_configurator_ui.js"></script>
+        </xpath>
+    </template>
 </odoo>
diff --git a/addons/hr_expense/static/src/js/tour.js b/addons/hr_expense/static/src/js/tours/hr_expense.js
similarity index 100%
rename from addons/hr_expense/static/src/js/tour.js
rename to addons/hr_expense/static/src/js/tours/hr_expense.js
diff --git a/addons/hr_expense/views/assets.xml b/addons/hr_expense/views/assets.xml
index 01ca1efbc01..010318f80bf 100644
--- a/addons/hr_expense/views/assets.xml
+++ b/addons/hr_expense/views/assets.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <template id="assets_backend_expense" name="hr_expense assets" inherit_id="web.assets_backend">
+        <template id="assets_tests" name="HR Expense Assets Tests" inherit_id="web.assets_tests">
             <xpath expr="." position="inside">
-                <script type="text/javascript" src="/hr_expense/static/src/js/tour.js"></script>
+                <script type="text/javascript" src="/hr_expense/static/src/js/tours/hr_expense.js"></script>
             </xpath>
         </template>
     </data>
diff --git a/addons/hr_recruitment/static/src/js/tour.js b/addons/hr_recruitment/static/src/js/tours/hr_recruitment.js
similarity index 100%
rename from addons/hr_recruitment/static/src/js/tour.js
rename to addons/hr_recruitment/static/src/js/tours/hr_recruitment.js
diff --git a/addons/hr_recruitment/views/hr_recruitment_templates.xml b/addons/hr_recruitment/views/hr_recruitment_templates.xml
index dd5e72ee93f..7eb215e3e67 100644
--- a/addons/hr_recruitment/views/hr_recruitment_templates.xml
+++ b/addons/hr_recruitment/views/hr_recruitment_templates.xml
@@ -5,7 +5,11 @@
             <xpath expr="." position="inside">
                 <link rel="stylesheet" type="text/scss" href="/hr_recruitment/static/src/scss/hr_job.scss"/>
                 <script type="text/javascript" src="/hr_recruitment/static/src/js/recruitment.js"></script>
-                <script type="text/javascript" src="/hr_recruitment/static/src/js/tour.js"></script>
+            </xpath>
+        </template>
+        <template id="assets_tests" name="HR Recruitment Assets Tests" inherit_id="web.assets_tests">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/hr_recruitment/static/src/js/tours/hr_recruitment.js"></script>
             </xpath>
         </template>
     </data>
diff --git a/addons/mail/static/src/js/tour.js b/addons/mail/static/src/js/tours/mail.js
similarity index 100%
rename from addons/mail/static/src/js/tour.js
rename to addons/mail/static/src/js/tours/mail.js
diff --git a/addons/mail/views/mail_templates.xml b/addons/mail/views/mail_templates.xml
index cd64ca186ca..15cd3f50e60 100644
--- a/addons/mail/views/mail_templates.xml
+++ b/addons/mail/views/mail_templates.xml
@@ -65,7 +65,7 @@
                 <!-- systray -->
                 <script type="text/javascript" src="/mail/static/src/js/systray/systray_activity_menu.js"></script>
                 <script type="text/javascript" src="/mail/static/src/js/systray/systray_messaging_menu.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/tour.js"></script>
+                <script type="text/javascript" src="/mail/static/src/js/tours/mail.js"></script>
                 <script type="text/javascript" src="/mail/static/src/js/user_menu.js"></script>
                 <!-- tools -->
                 <script type="text/javascript" src="/mail/static/src/js/tools/debug_manager.js"></script>
diff --git a/addons/point_of_sale/static/src/js/tour.js b/addons/point_of_sale/static/src/js/tours/point_of_sale.js
similarity index 100%
rename from addons/point_of_sale/static/src/js/tour.js
rename to addons/point_of_sale/static/src/js/tours/point_of_sale.js
diff --git a/addons/point_of_sale/static/src/js/tests.js b/addons/point_of_sale/static/tests/tours/point_of_sale.js
similarity index 100%
rename from addons/point_of_sale/static/src/js/tests.js
rename to addons/point_of_sale/static/tests/tours/point_of_sale.js
diff --git a/addons/point_of_sale/views/point_of_sale.xml b/addons/point_of_sale/views/point_of_sale.xml
index 7d58d841fd1..b476328700a 100644
--- a/addons/point_of_sale/views/point_of_sale.xml
+++ b/addons/point_of_sale/views/point_of_sale.xml
@@ -20,7 +20,6 @@
             <script type="text/javascript" src="/point_of_sale/static/src/js/gui.js"></script>
             <script type="text/javascript" src="/point_of_sale/static/src/js/popups.js"></script>
             <script type="text/javascript" src="/point_of_sale/static/src/js/screens.js"></script>
-            <script type="text/javascript" src="/point_of_sale/static/src/js/tests.js"></script>
         </template>
 
     <template id="wysiwyg_iframe_css_assets" name="CSS assets for wysiwyg iframe content">
diff --git a/addons/point_of_sale/views/point_of_sale_template.xml b/addons/point_of_sale/views/point_of_sale_template.xml
index fb00bb34283..00de0391bde 100644
--- a/addons/point_of_sale/views/point_of_sale_template.xml
+++ b/addons/point_of_sale/views/point_of_sale_template.xml
@@ -3,7 +3,13 @@
     <template id="assets_backend" name="hr assets" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
             <link rel="stylesheet" type="text/scss" href="/point_of_sale/static/src/scss/pos_dashboard.scss"/>
-            <script type="text/javascript" src="/point_of_sale/static/src/js/tour.js"></script>
+            <script type="text/javascript" src="/point_of_sale/static/src/js/tours/point_of_sale.js"></script>
+        </xpath>
+    </template>
+
+    <template id="assets_tests" name="Point Of Sale Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/point_of_sale/static/tests/tours/point_of_sale.js"></script>
         </xpath>
     </template>
 </odoo>
diff --git a/addons/portal/static/src/js/portal_tour.js b/addons/portal/static/tests/tours/portal.js
similarity index 100%
rename from addons/portal/static/src/js/portal_tour.js
rename to addons/portal/static/tests/tours/portal.js
diff --git a/addons/portal/views/assets.xml b/addons/portal/views/assets.xml
index 8ffa1cf5936..73024f03a0d 100644
--- a/addons/portal/views/assets.xml
+++ b/addons/portal/views/assets.xml
@@ -18,10 +18,15 @@
         </xpath>
         <xpath expr="//script[last()]" position="after">
             <script type="text/javascript" src="/portal/static/src/js/portal.js"></script>
-            <script type="text/javascript" src="/portal/static/src/js/portal_tour.js"></script>
             <script type="text/javascript" src="/portal/static/src/js/portal_chatter.js"></script>
             <script type="text/javascript" src="/portal/static/src/js/portal_signature.js"></script>
             <script type="text/javascript" src="/portal/static/src/js/portal_sidebar.js"></script>
         </xpath>
     </template>
+
+    <template id="assets_tests" name="Portal Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/portal/static/tests/tours/portal.js"></script>
+        </xpath>
+    </template>
 </odoo>
diff --git a/addons/project/static/src/js/tour.js b/addons/project/static/src/js/tours/project.js
similarity index 100%
rename from addons/project/static/src/js/tour.js
rename to addons/project/static/src/js/tours/project.js
diff --git a/addons/project/views/project_assets.xml b/addons/project/views/project_assets.xml
index 56516199012..fb203560543 100644
--- a/addons/project/views/project_assets.xml
+++ b/addons/project/views/project_assets.xml
@@ -5,7 +5,7 @@
                 <link rel="stylesheet" href="/project/static/src/css/project.css"/>
                 <script type="text/javascript" src="/project/static/src/js/project.js"></script>
                 <script type="text/javascript" src="/project/static/src/js/project_task_kanban_examples.js"></script>
-                <script type="text/javascript" src="/project/static/src/js/tour.js"></script>
+                <script type="text/javascript" src="/project/static/src/js/tours/project.js"></script>
                 <link rel="stylesheet" type="text/scss" href="/project/static/src/scss/project_dashboard.scss"/>
             </xpath>
         </template>
diff --git a/addons/sale/static/src/js/tour.js b/addons/sale/static/src/js/tours/sale.js
similarity index 100%
rename from addons/sale/static/src/js/tour.js
rename to addons/sale/static/src/js/tours/sale.js
diff --git a/addons/sale/static/src/js/sale_tour_sale_signature.js b/addons/sale/static/tests/tours/sale_signature.js
similarity index 100%
rename from addons/sale/static/src/js/sale_tour_sale_signature.js
rename to addons/sale/static/tests/tours/sale_signature.js
diff --git a/addons/sale/views/assets.xml b/addons/sale/views/assets.xml
index 9e7e42eff80..160f839cea7 100644
--- a/addons/sale/views/assets.xml
+++ b/addons/sale/views/assets.xml
@@ -7,7 +7,7 @@
         </xpath>
         <xpath expr="script[last()]" position="after">
             <script type="text/javascript" src="/sale/static/src/js/sale.js"></script>
-            <script type="text/javascript" src="/sale/static/src/js/tour.js"></script>
+            <script type="text/javascript" src="/sale/static/src/js/tours/sale.js"></script>
             <script type="text/javascript" src="/sale/static/src/js/account_reconciliation.js"></script>
         </xpath>
     </template>
@@ -17,7 +17,11 @@
         </xpath>
         <xpath expr="script[last()]" position="after">
             <script type="text/javascript" src="/sale/static/src/js/sale_portal_sidebar.js"></script>
-            <script type="text/javascript" src="/sale/static/src/js/sale_tour_sale_signature.js"></script>
+        </xpath>
+    </template>
+    <template id="assets_tests" name="Sale Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/sale/static/tests/tours/sale_signature.js"></script>
         </xpath>
     </template>
     <template id="qunit_suite" name="sale_tests" inherit_id="web.qunit_suite">
diff --git a/addons/sale_product_configurator/static/src/js/tour.js b/addons/sale_product_configurator/static/src/js/tours/sale_product_configurator.js
similarity index 100%
rename from addons/sale_product_configurator/static/src/js/tour.js
rename to addons/sale_product_configurator/static/src/js/tours/sale_product_configurator.js
diff --git a/addons/sale_product_configurator/static/tests/product_configurator_advanced_test_ui.js b/addons/sale_product_configurator/static/tests/tours/product_configurator_advanced_ui.js
similarity index 100%
rename from addons/sale_product_configurator/static/tests/product_configurator_advanced_test_ui.js
rename to addons/sale_product_configurator/static/tests/tours/product_configurator_advanced_ui.js
diff --git a/addons/sale_product_configurator/static/tests/product_configurator_edition_test_ui.js b/addons/sale_product_configurator/static/tests/tours/product_configurator_edition_ui.js
similarity index 100%
rename from addons/sale_product_configurator/static/tests/product_configurator_edition_test_ui.js
rename to addons/sale_product_configurator/static/tests/tours/product_configurator_edition_ui.js
diff --git a/addons/sale_product_configurator/static/tests/product_configurator_optional_products_test_ui.js b/addons/sale_product_configurator/static/tests/tours/product_configurator_optional_products_ui.js
similarity index 100%
rename from addons/sale_product_configurator/static/tests/product_configurator_optional_products_test_ui.js
rename to addons/sale_product_configurator/static/tests/tours/product_configurator_optional_products_ui.js
diff --git a/addons/sale_product_configurator/static/tests/product_configurator_pricelist_test_ui.js b/addons/sale_product_configurator/static/tests/tours/product_configurator_pricelist_ui.js
similarity index 100%
rename from addons/sale_product_configurator/static/tests/product_configurator_pricelist_test_ui.js
rename to addons/sale_product_configurator/static/tests/tours/product_configurator_pricelist_ui.js
diff --git a/addons/sale_product_configurator/static/tests/product_configurator_single_custom_attribute_test_ui.js b/addons/sale_product_configurator/static/tests/tours/product_configurator_single_custom_attribute_ui.js
similarity index 100%
rename from addons/sale_product_configurator/static/tests/product_configurator_single_custom_attribute_test_ui.js
rename to addons/sale_product_configurator/static/tests/tours/product_configurator_single_custom_attribute_ui.js
diff --git a/addons/sale_product_configurator/static/tests/product_configurator_test_ui.js b/addons/sale_product_configurator/static/tests/tours/product_configurator_ui.js
similarity index 100%
rename from addons/sale_product_configurator/static/tests/product_configurator_test_ui.js
rename to addons/sale_product_configurator/static/tests/tours/product_configurator_ui.js
diff --git a/addons/sale_product_configurator/views/assets.xml b/addons/sale_product_configurator/views/assets.xml
index f14e1f53ccd..82a4f57fbb5 100644
--- a/addons/sale_product_configurator/views/assets.xml
+++ b/addons/sale_product_configurator/views/assets.xml
@@ -5,19 +5,23 @@
             <link rel="stylesheet" type="text/scss" href="/sale_product_configurator/static/src/scss/product_configurator_widget.scss"/>
         </xpath>
         <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/sale_product_configurator/static/src/js/tour.js"></script>
+            <script type="text/javascript" src="/sale_product_configurator/static/src/js/tours/sale_product_configurator.js"></script>
             <script type="text/javascript" src="/sale/static/src/js/variant_mixin.js"></script>
             <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_renderer.js"></script>
             <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_controller.js"></script>
             <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_view.js"></script>
             <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_widget.js"/>
             <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_modal.js"></script>
-            <script type="text/javascript" src="/sale_product_configurator/static/tests/product_configurator_test_ui.js"/>
-            <script type="text/javascript" src="/sale_product_configurator/static/tests/product_configurator_advanced_test_ui.js"/>
-            <script type="text/javascript" src="/sale_product_configurator/static/tests/product_configurator_edition_test_ui.js"/>
-            <script type="text/javascript" src="/sale_product_configurator/static/tests/product_configurator_single_custom_attribute_test_ui.js"/>
-            <script type="text/javascript" src="/sale_product_configurator/static/tests/product_configurator_pricelist_test_ui.js"/>
-            <script type="text/javascript" src="/sale_product_configurator/static/tests/product_configurator_optional_products_test_ui.js"/>
+        </xpath>
+    </template>
+    <template id="assets_tests" name="Sale Product Configurator Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/sale_product_configurator/static/tests/tours/product_configurator_ui.js"/>
+            <script type="text/javascript" src="/sale_product_configurator/static/tests/tours/product_configurator_advanced_ui.js"/>
+            <script type="text/javascript" src="/sale_product_configurator/static/tests/tours/product_configurator_edition_ui.js"/>
+            <script type="text/javascript" src="/sale_product_configurator/static/tests/tours/product_configurator_single_custom_attribute_ui.js"/>
+            <script type="text/javascript" src="/sale_product_configurator/static/tests/tours/product_configurator_pricelist_ui.js"/>
+            <script type="text/javascript" src="/sale_product_configurator/static/tests/tours/product_configurator_optional_products_ui.js"/>
         </xpath>
     </template>
     <template id="qunit_suite" inherit_id="web.qunit_suite" name="sale_product_configurator_tests">
diff --git a/addons/stock/static/tests/route_tour.js b/addons/stock/static/tests/tours/route.js
similarity index 100%
rename from addons/stock/static/tests/route_tour.js
rename to addons/stock/static/tests/tours/route.js
diff --git a/addons/stock/views/stock_template.xml b/addons/stock/views/stock_template.xml
index f513c0b0aa5..dfc841d132d 100644
--- a/addons/stock/views/stock_template.xml
+++ b/addons/stock/views/stock_template.xml
@@ -3,7 +3,6 @@
 
     <template id="stock_assets_backend" name="mrp_workorder assets" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
-            <script type="text/javascript" src="/stock/static/tests/route_tour.js"></script>
             <script type="text/javascript" src="/stock/static/src/js/inventory_singleton_list_controller.js"></script>
             <script type="text/javascript" src="/stock/static/src/js/inventory_singleton_list_view.js"></script>
             <script type="text/javascript" src="/stock/static/src/js/inventory_validate_button_controller.js"></script>
@@ -20,6 +19,12 @@
         </xpath>
     </template>
 
+   <template id="assets_tests" name="Stock Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/stock/static/tests/tours/route.js"></script>
+        </xpath>
+    </template>
+
    <template id="message_head">
         <t t-if="move.state != 'done'">
             <strong>The initial demand has been updated.</strong>
diff --git a/addons/survey/static/src/js/tour_test_certification_failure.js b/addons/survey/static/tests/tours/certification_failure.js
similarity index 100%
rename from addons/survey/static/src/js/tour_test_certification_failure.js
rename to addons/survey/static/tests/tours/certification_failure.js
diff --git a/addons/survey/static/src/js/tour_test_certification_success.js b/addons/survey/static/tests/tours/certification_success.js
similarity index 100%
rename from addons/survey/static/src/js/tour_test_certification_success.js
rename to addons/survey/static/tests/tours/certification_success.js
diff --git a/addons/survey/static/src/js/tour_test_survey.js b/addons/survey/static/tests/tours/survey.js
similarity index 100%
rename from addons/survey/static/src/js/tour_test_survey.js
rename to addons/survey/static/tests/tours/survey.js
diff --git a/addons/survey/static/src/js/tour_test_survey_prefill.js b/addons/survey/static/tests/tours/survey_prefill.js
similarity index 100%
rename from addons/survey/static/src/js/tour_test_survey_prefill.js
rename to addons/survey/static/tests/tours/survey_prefill.js
diff --git a/addons/survey/views/assets.xml b/addons/survey/views/assets.xml
index 6eb19c98961..381531bfd41 100644
--- a/addons/survey/views/assets.xml
+++ b/addons/survey/views/assets.xml
@@ -10,10 +10,6 @@
         <script type="text/javascript" src="/survey/static/src/js/survey_result.js" />
         <script type="text/javascript" src="/survey/static/src/js/survey.js" />
         <script type="text/javascript" src="/survey/static/src/js/survey_timer.js" />
-        <script type="text/javascript" src="/survey/static/src/js/tour_test_survey.js"></script>
-        <script type="text/javascript" src="/survey/static/src/js/tour_test_certification_success.js"></script>
-        <script type="text/javascript" src="/survey/static/src/js/tour_test_certification_failure.js"></script>
-        <script type="text/javascript" src="/survey/static/src/js/tour_test_survey_prefill.js"></script>
 
         <link href="/survey/static/src/css/survey_print.css" rel="stylesheet" type="text/css"/>
         <link href="/survey/static/src/css/survey_result.css" rel="stylesheet" type="text/css"></link>
@@ -36,5 +32,14 @@
             <link rel="stylesheet" type="text/scss" href="/survey/static/src/scss/survey_views.scss"/>
         </xpath>
     </template>
+
+    <template id="assets_tests" name="Survey Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/survey/static/tests/tours/certification_failure.js"></script>
+            <script type="text/javascript" src="/survey/static/tests/tours/certification_success.js"></script>
+            <script type="text/javascript" src="/survey/static/tests/tours/survey.js"></script>
+            <script type="text/javascript" src="/survey/static/tests/tours/survey_prefill.js"></script>
+        </xpath>
+    </template>
 </data>
 </odoo>
diff --git a/addons/test_website/static/src/js/reset_views.test.js b/addons/test_website/static/tests/tours/reset_views.js
similarity index 100%
rename from addons/test_website/static/src/js/reset_views.test.js
rename to addons/test_website/static/tests/tours/reset_views.js
diff --git a/addons/test_website/views/templates.xml b/addons/test_website/views/templates.xml
index 2ce171bac30..4a6389cf9c7 100644
--- a/addons/test_website/views/templates.xml
+++ b/addons/test_website/views/templates.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="assets_frontend" inherit_id="website.assets_frontend">
-        <xpath expr="script[last()]" position="after">
-             <script type="text/javascript" src="/test_website/static/src/js/reset_views.test.js"></script>
+    <template id="assets_tests" name="Test Website Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+             <script type="text/javascript" src="/test_website/static/tests/tours/reset_views.js"></script>
         </xpath>
     </template>
 </odoo>
diff --git a/addons/website/static/src/js/html_editor.test.js b/addons/website/static/tests/tours/html_editor.js
similarity index 100%
rename from addons/website/static/src/js/html_editor.test.js
rename to addons/website/static/tests/tours/html_editor.js
diff --git a/addons/website/static/src/js/tours/website_tour_reset_password.js b/addons/website/static/tests/tours/reset_password.js
similarity index 100%
rename from addons/website/static/src/js/tours/website_tour_reset_password.js
rename to addons/website/static/tests/tours/reset_password.js
diff --git a/addons/website/static/src/js/tours/restricted_editor.js b/addons/website/static/tests/tours/restricted_editor.js
similarity index 100%
rename from addons/website/static/src/js/tours/restricted_editor.js
rename to addons/website/static/tests/tours/restricted_editor.js
diff --git a/addons/website/static/src/js/tours/rte.js b/addons/website/static/tests/tours/rte.js
similarity index 100%
rename from addons/website/static/src/js/tours/rte.js
rename to addons/website/static/tests/tours/rte.js
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 3c5904dd034..aa91696e1f6 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -17,9 +17,12 @@
     </xpath>
 </template>
 
-<template id="assets_common" name="Website Assets Common" inherit_id="web.assets_common">
+<template id="assets_tests" name="Website Assets Tests" inherit_id="web.assets_tests">
     <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website/static/src/js/tours/website_tour_reset_password.js"></script>
+        <script type="text/javascript" src="/website/static/tests/tours/reset_password.js"></script>
+        <script type="text/javascript" src="/website/static/tests/tours/rte.js"/>
+        <script type="text/javascript" src="/website/static/tests/tours/html_editor.js"/>
+        <script type="text/javascript" src="/website/static/tests/tours/restricted_editor.js"/>
     </xpath>
 </template>
 
@@ -30,7 +33,6 @@
     <xpath expr="//script[last()]" position="after">
         <script type="text/javascript" src="/website/static/src/js/backend/button.js"/>
         <script type="text/javascript" src="/website/static/src/js/backend/dashboard.js"/>
-        <script type="text/javascript" src="/website/static/src/js/tours/rte.js"/>
     </xpath>
 </template>
 
@@ -73,8 +75,6 @@
 
         <script type="text/javascript" src="/website/static/src/js/menu/navbar.js"/>
 
-        <script type="text/javascript" src="/website/static/src/js/html_editor.test.js"/>
-
         <!-- Custom empty file for user javascript -->
         <script type="text/javascript" src="/website/static/src/js/user_custom_javascript.js"/>
     </xpath>
@@ -122,8 +122,6 @@
 
     <script type="text/javascript" src="/website/static/src/js/tours/banner.js"/>
     <script type="text/javascript" src="/website/static/src/js/tours/customize.js"/>
-    <script type="text/javascript" src="/website/static/src/js/tours/restricted_editor.js"/>
-    <script type="text/javascript" src="/website/static/src/js/tours/rte.js"/>
 
     <script type="text/javascript" src="/website/static/src/js/widgets/ace.js"/>
     <script type="text/javascript" src="/website/static/src/js/widgets/theme.js"/>
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/tours/website_blog.js
similarity index 100%
rename from addons/website_blog/static/src/js/website.tour.blog.js
rename to addons/website_blog/static/src/js/tours/website_blog.js
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index cd5534f29c5..d9a22c4b3f4 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -11,7 +11,7 @@
     <xpath expr="." position="inside">
         <script type="text/javascript" src="/website_blog/static/src/js/website_blog.editor.js"></script>
         <script type="text/javascript" src="/website_blog/static/src/js/s_latest_posts_editor.js"/>
-        <script type="text/javascript" src="/website_blog/static/src/js/website.tour.blog.js"></script>
+        <script type="text/javascript" src="/website_blog/static/src/js/tours/website_blog.js"></script>
     </xpath>
 </template>
 
diff --git a/addons/website_crm/static/src/js/website_crm_tour.js b/addons/website_crm/static/tests/tours/website_crm.js
similarity index 100%
rename from addons/website_crm/static/src/js/website_crm_tour.js
rename to addons/website_crm/static/tests/tours/website_crm.js
diff --git a/addons/website_crm/views/website_crm_templates.xml b/addons/website_crm/views/website_crm_templates.xml
index 20ad233996e..688ed312cb2 100644
--- a/addons/website_crm/views/website_crm_templates.xml
+++ b/addons/website_crm/views/website_crm_templates.xml
@@ -57,9 +57,9 @@
         </xpath>
     </template>
 
-        <template id="website_crm_tests" name="Website CRM Tests" inherit_id="web.assets_frontend">
+        <template id="assets_tests" name="Website CRM Assets Tests" inherit_id="web.assets_tests">
             <xpath expr="." position="inside">
-                <script type="text/javascript" src="/website_crm/static/src/js/website_crm_tour.js"></script>
+                <script type="text/javascript" src="/website_crm/static/tests/tours/website_crm.js"></script>
             </xpath>
         </template>
 
diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/tours/website_event.js
similarity index 100%
rename from addons/website_event/static/src/js/website.tour.event.js
rename to addons/website_event/static/src/js/tours/website_event.js
diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml
index 374faf60552..4231efb2907 100644
--- a/addons/website_event/views/event_templates.xml
+++ b/addons/website_event/views/event_templates.xml
@@ -14,7 +14,7 @@
 <template id="assets_editor" inherit_id="website.assets_editor" name="Event Editor">
     <xpath expr="." position="inside">
         <script type="text/javascript" src="/website_event/static/src/js/website_event.editor.js"></script>
-        <script type="text/javascript" src="/website_event/static/src/js/website.tour.event.js"></script>
+        <script type="text/javascript" src="/website_event/static/src/js/tours/website_event.js"></script>
     </xpath>
 </template>
 
diff --git a/addons/website_event_sale/static/src/js/website.tour.event_sale.js b/addons/website_event_sale/static/tests/tours/website_event_sale.js
similarity index 100%
rename from addons/website_event_sale/static/src/js/website.tour.event_sale.js
rename to addons/website_event_sale/static/tests/tours/website_event_sale.js
diff --git a/addons/website_event_sale/views/event_templates.xml b/addons/website_event_sale/views/event_templates.xml
index 86740e22719..c43cd83e6ac 100644
--- a/addons/website_event_sale/views/event_templates.xml
+++ b/addons/website_event_sale/views/event_templates.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="assets_editor" inherit_id="website.assets_frontend" name="Event Sale">
-  <xpath expr="." position="inside">
-    <script type="text/javascript" src="/website_event_sale/static/src/js/website.tour.event_sale.js"></script>
-  </xpath>
+<template id="assets_tests" inherit_id="web.assets_tests" name="Website Event Sale Assets Tests">
+    <xpath expr="." position="inside">
+        <script type="text/javascript" src="/website_event_sale/static/tests/tours/website_event_sale.js"></script>
+    </xpath>
 </template>
 
 <template id="index" inherit_id="website_event.index" name="Event's Ticket">
diff --git a/addons/website_form/static/src/js/website_form_editor_tour.js b/addons/website_form/static/tests/tours/website_form_editor.js
similarity index 100%
rename from addons/website_form/static/src/js/website_form_editor_tour.js
rename to addons/website_form/static/tests/tours/website_form_editor.js
diff --git a/addons/website_form/views/assets.xml b/addons/website_form/views/assets.xml
index 0c463b6151c..a9615d1ae27 100644
--- a/addons/website_form/views/assets.xml
+++ b/addons/website_form/views/assets.xml
@@ -6,7 +6,6 @@
             <xpath expr="." position="inside">
                 <link rel="stylesheet" type="text/scss" href="/website_form/static/src/scss/website_form.scss"/>
                 <script type="text/javascript" src="/website_form/static/src/js/website_form.js"/>
-                <script type="text/javascript" src="/website_form/static/src/js/website_form_editor_tour.js"/>
             </xpath>
         </template>
 
@@ -17,5 +16,10 @@
             </xpath>
         </template>
 
+        <template id="assets_tests" name="Website Form Assets Tests" inherit_id="web.assets_tests">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/website_form/static/tests/tours/website_form_editor.js"/>
+            </xpath>
+        </template>
     </data>
 </odoo>
diff --git a/addons/website_forum/static/src/js/website_tour_forum.js b/addons/website_forum/static/src/js/tours/website_forum.js
similarity index 100%
rename from addons/website_forum/static/src/js/website_tour_forum.js
rename to addons/website_forum/static/src/js/tours/website_forum.js
diff --git a/addons/website_forum/static/src/js/website_tour_forum_question.js b/addons/website_forum/static/tests/tours/website_forum_question.js
similarity index 100%
rename from addons/website_forum/static/src/js/website_tour_forum_question.js
rename to addons/website_forum/static/tests/tours/website_forum_question.js
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 269e766e912..24fdc26feb3 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -5,11 +5,17 @@
 <!-- Editor custom -->
 <template id="assets_editor" inherit_id="website.assets_editor" name="Forum Editor Assets">
     <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_forum/static/src/js/website_tour_forum.js"/>
+        <script type="text/javascript" src="/website_forum/static/src/js/tours/website_forum.js"/>
         <script type="text/javascript" src="/website_forum/static/src/js/website_forum.editor.js"/>
     </xpath>
 </template>
 
+<template id="assets_tests" name="Website Forum Assets Tests" inherit_id="web.assets_tests">
+    <xpath expr="." position="inside">
+        <script type="text/javascript" src="/website_forum/static/tests/tours/website_forum_question.js"></script>
+    </xpath>
+</template>
+
 <template id="assets_frontend" inherit_id="website.assets_frontend">
     <xpath expr="link[last()]" position="after">
         <link rel="stylesheet" type="text/scss" href="/website_forum/static/src/scss/website_forum.scss"/>
@@ -17,7 +23,6 @@
     <xpath expr="script[last()]" position="after">
         <script type="text/javascript" src="/website_forum/static/src/js/website_forum.js"/>
         <script type="text/javascript" src="/website_forum/static/src/js/website_forum.share.js"/>
-        <script type="text/javascript" src="/website_forum/static/src/js/website_tour_forum_question.js"/>
     </xpath>
 </template>
 
diff --git a/addons/website_hr_recruitment/static/src/js/website_hr_recruitment_tour.js b/addons/website_hr_recruitment/static/tests/tours/website_hr_recruitment.js
similarity index 100%
rename from addons/website_hr_recruitment/static/src/js/website_hr_recruitment_tour.js
rename to addons/website_hr_recruitment/static/tests/tours/website_hr_recruitment.js
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
index a948f511121..67a57615f42 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
@@ -549,9 +549,9 @@
     </xpath>
 </template>
 
-<template id="website_hr_recuitment_tests" name="Website HR Recruitment Tests" inherit_id="web.assets_frontend">
+<template id="assets_tests" name="Website HR Recruitment Assets Tests" inherit_id="web.assets_tests">
     <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_hr_recruitment/static/src/js/website_hr_recruitment_tour.js"></script>
+        <script type="text/javascript" src="/website_hr_recruitment/static/tests/tours/website_hr_recruitment.js"></script>
     </xpath>
 </template>
 
diff --git a/addons/website_links/static/src/js/test_ui_flow.js b/addons/website_links/static/tests/tours/website_links.js
similarity index 100%
rename from addons/website_links/static/src/js/test_ui_flow.js
rename to addons/website_links/static/tests/tours/website_links.js
diff --git a/addons/website_links/views/website_links_template.xml b/addons/website_links/views/website_links_template.xml
index 626ec232e53..63d5606092c 100644
--- a/addons/website_links/views/website_links_template.xml
+++ b/addons/website_links/views/website_links_template.xml
@@ -6,11 +6,16 @@
                 <script type="text/javascript" src="/website_links/static/src/js/website_links.js"/>
                 <script type="text/javascript" src="/website_links/static/src/js/website_links_code_editor.js"/>
                 <script type="text/javascript" src="/website_links/static/src/js/website_links_charts.js"/>
-                <script type="text/javascript" src="/website_links/static/src/js/test_ui_flow.js"/>
                 <link rel="stylesheet" type="text/css" href="/website_links/static/src/css/website_links.css"/>
             </xpath>
         </template>
 
+        <template id="assets_tests" name="Website Links Assets Tests" inherit_id="web.assets_tests">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/website_links/static/tests/tours/website_links.js"></script>
+            </xpath>
+        </template>
+
         <template id="share_page_menu" inherit_id="website.user_navbar">
             <xpath expr="//a[@data-action='promote-current-page']" position="after">
                 <a href="/r" id="o_website_links_share_page" class="dropdown-item">
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop.js b/addons/website_sale/static/src/js/tours/website_sale_shop.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour_shop.js
rename to addons/website_sale/static/src/js/tours/website_sale_shop.js
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_backend.js b/addons/website_sale/static/src/js/tours/website_sale_shop_backend.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour_shop_backend.js
rename to addons/website_sale/static/src/js/tours/website_sale_shop_backend.js
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_frontend.js b/addons/website_sale/static/src/js/tours/website_sale_shop_frontend.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour_shop_frontend.js
rename to addons/website_sale/static/src/js/tours/website_sale_shop_frontend.js
diff --git a/addons/website_sale/static/src/js/website_sale_tour_buy.js b/addons/website_sale/static/tests/tours/website_sale_buy.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour_buy.js
rename to addons/website_sale/static/tests/tours/website_sale_buy.js
diff --git a/addons/website_sale/static/src/js/website_sale_tour.js b/addons/website_sale/static/tests/tours/website_sale_complete_flow.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour.js
rename to addons/website_sale/static/tests/tours/website_sale_complete_flow.js
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_cart_recovery.js b/addons/website_sale/static/tests/tours/website_sale_shop_cart_recovery.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour_shop_cart_recovery.js
rename to addons/website_sale/static/tests/tours/website_sale_shop_cart_recovery.js
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_custom_attribute_value.js b/addons/website_sale/static/tests/tours/website_sale_shop_custom_attribute_value.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour_shop_custom_attribute_value.js
rename to addons/website_sale/static/tests/tours/website_sale_shop_custom_attribute_value.js
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_customize.js b/addons/website_sale/static/tests/tours/website_sale_shop_customize.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour_shop_customize.js
rename to addons/website_sale/static/tests/tours/website_sale_shop_customize.js
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_deleted_archived_variants.js b/addons/website_sale/static/tests/tours/website_sale_shop_deleted_archived_variants.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour_shop_deleted_archived_variants.js
rename to addons/website_sale/static/tests/tours/website_sale_shop_deleted_archived_variants.js
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_dynamic_variants.js b/addons/website_sale/static/tests/tours/website_sale_shop_dynamic_variants.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour_shop_dynamic_variants.js
rename to addons/website_sale/static/tests/tours/website_sale_shop_dynamic_variants.js
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_list_view_b2c.js b/addons/website_sale/static/tests/tours/website_sale_shop_list_view_b2c.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour_shop_list_view_b2c.js
rename to addons/website_sale/static/tests/tours/website_sale_shop_list_view_b2c.js
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_mail.js b/addons/website_sale/static/tests/tours/website_sale_shop_mail.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour_shop_mail.js
rename to addons/website_sale/static/tests/tours/website_sale_shop_mail.js
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_no_variant_attribute.js b/addons/website_sale/static/tests/tours/website_sale_shop_no_variant_attribute.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour_shop_no_variant_attribute.js
rename to addons/website_sale/static/tests/tours/website_sale_shop_no_variant_attribute.js
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop_zoom.js b/addons/website_sale/static/tests/tours/website_sale_shop_zoom.js
similarity index 100%
rename from addons/website_sale/static/src/js/website_sale_tour_shop_zoom.js
rename to addons/website_sale/static/tests/tours/website_sale_shop_zoom.js
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 0182725b451..cff60a50803 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -12,7 +12,7 @@
             <script type="text/javascript" src="/website_sale/static/src/js/website_sale_backend.js"></script>
             <link rel="stylesheet" type="text/scss" href="/website_sale/static/src/scss/website_sale_dashboard.scss"/>
             <link rel="stylesheet" type="text/scss" href="/website_sale/static/src/scss/website_sale_backend.scss"/>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop_backend.js"></script>
+            <script type="text/javascript" src="/website_sale/static/src/js/tours/website_sale_shop_backend.js"></script>
         </xpath>
     </template>
 
@@ -31,16 +31,7 @@
             <script type="text/javascript" src="/website_sale/static/src/js/website_sale_utils.js"></script>
             <script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
             <script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_buy.js"></script>
             <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tracking.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop_customize.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop_custom_attribute_value.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop_zoom.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop_dynamic_variants.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop_deleted_archived_variants.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop_list_view_b2c.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop_no_variant_attribute.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour.js"></script>
         </xpath>
     </template>
 
@@ -50,16 +41,30 @@
         </xpath>
         <xpath expr="//script[last()]" position="after">
             <script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop_frontend.js"></script>
             <script type="text/javascript" src="/website_sale/static/src/js/website_sale_form_editor.js"></script>
+            <script type="text/javascript" src="/website_sale/static/src/js/tours/website_sale_shop_frontend.js"></script>
         </xpath>
     </template>
 
     <template id="assets_common" name="tour" inherit_id="web.assets_common">
         <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop_cart_recovery.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop_mail.js"></script>
+            <script type="text/javascript" src="/website_sale/static/src/js/tours/website_sale_shop.js"></script>
+        </xpath>
+    </template>
+
+    <template id="assets_tests" name="Website Sale Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_buy.js"></script>
+            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_complete_flow.js"></script>
+            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_cart_recovery.js"></script>
+            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_mail.js"></script>
+            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_customize.js"></script>
+            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_custom_attribute_value.js"></script>
+            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_zoom.js"></script>
+            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_dynamic_variants.js"></script>
+            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_deleted_archived_variants.js"></script>
+            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_list_view_b2c.js"></script>
+            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_no_variant_attribute.js"></script>
         </xpath>
     </template>
 
diff --git a/addons/website_sale_coupon/static/src/js/website_sale_coupon.test.js b/addons/website_sale_coupon/static/tests/tours/website_sale_coupon.js
similarity index 100%
rename from addons/website_sale_coupon/static/src/js/website_sale_coupon.test.js
rename to addons/website_sale_coupon/static/tests/tours/website_sale_coupon.js
diff --git a/addons/website_sale_coupon/views/website_sale_templates.xml b/addons/website_sale_coupon/views/website_sale_templates.xml
index fa02669ca53..db123dcc504 100644
--- a/addons/website_sale_coupon/views/website_sale_templates.xml
+++ b/addons/website_sale_coupon/views/website_sale_templates.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="assets_frontend" inherit_id="website.assets_frontend" name="Shop Sale Coupon">
+<template id="assets_tests" name="Website Sale Coupon Assets Tests" inherit_id="web.assets_tests">
     <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_sale_coupon/static/src/js/website_sale_coupon.test.js"></script>
+        <script type="text/javascript" src="/website_sale_coupon/static/tests/tours/website_sale_coupon.js"></script>
     </xpath>
 </template>
 <template id="website_sale_coupon_cart_hide_qty" inherit_id="website_sale.cart_lines">
diff --git a/addons/website_sale_product_configurator/static/src/js/website_sale_tour_buy.js b/addons/website_sale_product_configurator/static/tests/tours/website_sale_buy.js
similarity index 100%
rename from addons/website_sale_product_configurator/static/src/js/website_sale_tour_buy.js
rename to addons/website_sale_product_configurator/static/tests/tours/website_sale_buy.js
diff --git a/addons/website_sale_product_configurator/static/src/js/website_sale_tour_shop_custom_attributes_value.js b/addons/website_sale_product_configurator/static/tests/tours/website_sale_shop_custom_attributes_value.js
similarity index 100%
rename from addons/website_sale_product_configurator/static/src/js/website_sale_tour_shop_custom_attributes_value.js
rename to addons/website_sale_product_configurator/static/tests/tours/website_sale_shop_custom_attributes_value.js
diff --git a/addons/website_sale_product_configurator/views/assets.xml b/addons/website_sale_product_configurator/views/assets.xml
index e6344530e53..95aa13a2dce 100644
--- a/addons/website_sale_product_configurator/views/assets.xml
+++ b/addons/website_sale_product_configurator/views/assets.xml
@@ -11,8 +11,12 @@
         </xpath>
         <xpath expr="script[last()]" position="after">
             <script type="text/javascript" src="/website_sale_product_configurator/static/src/js/website_sale_options.js"></script>
-            <script type="text/javascript" src="/website_sale_product_configurator/static/src/js/website_sale_tour_buy.js"></script>
-            <script type="text/javascript" src="/website_sale_product_configurator/static/src/js/website_sale_tour_shop_custom_attributes_value.js"></script>
+        </xpath>
+    </template>
+    <template id="assets_tests" name="Website Sale Product Configurator Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/website_sale_product_configurator/static/tests/tours/website_sale_buy.js"></script>
+            <script type="text/javascript" src="/website_sale_product_configurator/static/tests/tours/website_sale_shop_custom_attributes_value.js"></script>
         </xpath>
     </template>
 </odoo>
diff --git a/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js b/addons/website_sale_wishlist/static/tests/tours/website_sale_wishlist.js
similarity index 100%
rename from addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js
rename to addons/website_sale_wishlist/static/tests/tours/website_sale_wishlist.js
diff --git a/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml b/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
index 76660917f4f..d8f43248403 100644
--- a/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
+++ b/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
@@ -5,7 +5,12 @@
         <xpath expr="." position="inside">
             <link rel="stylesheet" type="text/scss" href="/website_sale_wishlist/static/src/scss/website_sale_wishlist.scss"/>
             <script type="text/javascript" src="/website_sale_wishlist/static/src/js/website_sale_wishlist.js"></script>
-            <script type="text/javascript" src="/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js"></script>
+        </xpath>
+    </template>
+
+    <template id="assets_tests" name="Website Sale Wishlist Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/website_sale_wishlist/static/tests/tours/website_sale_wishlist.js"></script>
         </xpath>
     </template>
 
diff --git a/odoo/addons/test_main_flows/__manifest__.py b/odoo/addons/test_main_flows/__manifest__.py
index cc8feb4fa59..7dcb3a7457e 100644
--- a/odoo/addons/test_main_flows/__manifest__.py
+++ b/odoo/addons/test_main_flows/__manifest__.py
@@ -10,7 +10,7 @@ It will install some main apps and will try to execute the most important action
 """,
     'depends': ['web_tour', 'crm', 'sale_timesheet', 'purchase_stock', 'mrp', 'account'],
     'data': [
-        'views/templates.xml',
+        'views/assets.xml',
     ],
     'installable': True,
     'post_init_hook': '_auto_install_enterprise_dependencies',
diff --git a/odoo/addons/test_main_flows/static/src/js/tour.js b/odoo/addons/test_main_flows/static/tests/tours/main_flow.js
similarity index 100%
rename from odoo/addons/test_main_flows/static/src/js/tour.js
rename to odoo/addons/test_main_flows/static/tests/tours/main_flow.js
diff --git a/odoo/addons/test_main_flows/views/templates.xml b/odoo/addons/test_main_flows/views/assets.xml
similarity index 58%
rename from odoo/addons/test_main_flows/views/templates.xml
rename to odoo/addons/test_main_flows/views/assets.xml
index 9c1bd81699f..c2691297179 100644
--- a/odoo/addons/test_main_flows/views/templates.xml
+++ b/odoo/addons/test_main_flows/views/assets.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="assets_backend" name="the flow assets" inherit_id="web.assets_backend">
+    <template id="assets_tests" name="The Flow Assets Tests" inherit_id="web.assets_tests">
         <xpath expr="." position="inside">
-            <script type="text/javascript" src="/test_main_flows/static/src/js/tour.js"></script>
+            <script type="text/javascript" src="/test_main_flows/static/tests/tours/main_flow.js"></script>
         </xpath>
     </template>
 </odoo>
diff --git a/odoo/addons/test_new_api/__manifest__.py b/odoo/addons/test_new_api/__manifest__.py
index e238f37f779..cdbd5291879 100644
--- a/odoo/addons/test_new_api/__manifest__.py
+++ b/odoo/addons/test_new_api/__manifest__.py
@@ -11,6 +11,6 @@
         'ir.model.access.csv',
         'views.xml',
         'demo_data.xml',
-        'template.xml',
+        'assets.xml',
     ],
 }
diff --git a/odoo/addons/test_new_api/assets.xml b/odoo/addons/test_new_api/assets.xml
new file mode 100644
index 00000000000..8d0103a311d
--- /dev/null
+++ b/odoo/addons/test_new_api/assets.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="assets_tests" name="Test New Api Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/test_new_api/static/tests/tours/x2many.js"></script>
+        </xpath>
+    </template>
+</odoo>
+
diff --git a/odoo/addons/test_new_api/static/tests/x2many.js b/odoo/addons/test_new_api/static/tests/tours/x2many.js
similarity index 99%
rename from odoo/addons/test_new_api/static/tests/x2many.js
rename to odoo/addons/test_new_api/static/tests/tours/x2many.js
index 06a804fca9e..ae4c0e3c8d3 100644
--- a/odoo/addons/test_new_api/static/tests/x2many.js
+++ b/odoo/addons/test_new_api/static/tests/tours/x2many.js
@@ -5,7 +5,7 @@ odoo.define('web.test.x2many', function (require) {
     var inc;
 
     tour.register('widget_x2many', {
-        url: '/web?debug=assets#action=test_new_api.action_discussions',
+        url: '/web#action=test_new_api.action_discussions',
         test: true,
     }, [
     /////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/odoo/addons/test_new_api/template.xml b/odoo/addons/test_new_api/template.xml
deleted file mode 100644
index f62d3d47f20..00000000000
--- a/odoo/addons/test_new_api/template.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="test_new_api backend assets" inherit_id="web.assets_backend">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/test_new_api/static/tests/x2many.js"></script>
-        </xpath>
-    </template>
-</odoo>
-