diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index cdb439a3739..ff462b28991 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -670,117 +670,125 @@
             <t t-set="html_data" t-value="{'style': 'height: 100%;'}"/>
             <t t-set="title">Web Tests</t>
             <t t-set="head">
-                <t t-call="web.css_tests_assets"/>
-                <t t-call="web.js_tests_assets"/>
-
-                <script type="text/javascript" src="/base/static/tests/base_settings_tests.js"></script>
-
-                <script type="text/javascript" src="/web/static/tests/qweb_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/mockserver_tests.js"></script>
-
-                <script type="text/javascript" src="/web/static/tests/services/data_manager_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/services/notification_service_tests.js"></script>
-
-                <script type="text/javascript" src="/web/static/tests/fields/basic_fields_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/fields/field_utils_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/fields/relational_fields_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/fields/relational_fields/field_many2many_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/fields/relational_fields/field_many2one_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/fields/relational_fields/field_one2many_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/fields/signature_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/fields/special_fields_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/fields/upgrade_fields_tests.js"></script>
-
-                <script type="text/javascript" src="/web/static/tests/views/abstract_controller_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/views/abstract_view_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/views/form_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/views/graph_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/views/list_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/views/pivot_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/views/kanban_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/views/calendar_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/views/qweb_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/views/basic_model_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/views/abstract_view_banner_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/views/kanban_model_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/views/view_dialogs_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/views/search_panel_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/ajax_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/registry_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/py_utils_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/class_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/rpc_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/domain_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/data_comparison_utils_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/math_utils_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/mixins_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/time_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/concurrency_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/util_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/widget_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/dialog_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/owl_dialog_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/core/dom_tests.js"></script>
-
-                <script type="text/javascript" src="/web/static/tests/chrome/action_manager_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/chrome/keyboard_navigation_mixin_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/chrome/menu_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/chrome/user_menu_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/chrome/systray_tests.js"></script>
-
-                <script type="text/javascript" src="/web/static/tests/components/custom_checkbox_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/components/custom_file_input_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/components/datepicker_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/components/pager_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/components/action_menus_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/components/dropdown_menu_tests.js"></script>
-
-                <script type="text/javascript" src="/web/static/tests/control_panel/control_panel_model_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/control_panel/control_panel_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/control_panel/favorite_menu_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/control_panel/custom_filter_item_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/control_panel/filter_menu_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/control_panel/custom_group_by_item_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/control_panel/groupby_menu_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/control_panel/search_bar_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/control_panel/time_range_menu_tests.js"></script>
-
-                <script type="text/javascript" src="/web/static/tests/widgets/company_switcher_tests.js"/>
-                <script type="text/javascript" src="/web/static/tests/widgets/data_export_tests.js"/>
-                <script type="text/javascript" src="/web/static/tests/widgets/domain_selector_tests.js"/>
-                <script type="text/javascript" src="/web/static/tests/widgets/model_field_selector_tests.js"/>
-                <script type="text/javascript" src="/web/static/tests/widgets/rainbow_man_tests.js"/>
-
-                <script type="text/javascript" src="/web/static/tests/tools/debug_manager_tests.js"/>
-
-                <script type="text/javascript" src="/web/static/tests/helpers/test_utils_tests.js"></script>
-
-                <script type="text/javascript" src="/web/static/tests/owl_compatibility_tests.js"></script>
+                <t t-call-assets="web.qunit_suite_tests" t-js="false"/>
+                <t t-call-assets="web.qunit_suite_tests" t-css="false"/>
             </t>
-
             <div id="qunit"/>
             <div id="qunit-fixture"/>
         </t>
     </template>
 
+    <template id="web.qunit_suite_tests">
+        <t t-call="web.css_tests_assets"/>
+        <t t-call="web.js_tests_assets"/>
+
+        <script type="text/javascript" src="/base/static/tests/base_settings_tests.js"></script>
+
+        <script type="text/javascript" src="/web/static/tests/qweb_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/mockserver_tests.js"></script>
+
+        <script type="text/javascript" src="/web/static/tests/services/data_manager_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/services/notification_service_tests.js"></script>
+
+        <script type="text/javascript" src="/web/static/tests/fields/basic_fields_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/fields/field_utils_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/fields/relational_fields_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/fields/relational_fields/field_many2many_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/fields/relational_fields/field_many2one_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/fields/relational_fields/field_one2many_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/fields/signature_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/fields/special_fields_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/fields/upgrade_fields_tests.js"></script>
+
+        <script type="text/javascript" src="/web/static/tests/views/abstract_controller_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/views/abstract_view_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/views/form_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/views/graph_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/views/list_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/views/pivot_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/views/kanban_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/views/calendar_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/views/qweb_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/views/basic_model_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/views/abstract_view_banner_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/views/kanban_model_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/views/view_dialogs_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/views/search_panel_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/ajax_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/registry_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/py_utils_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/class_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/rpc_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/domain_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/data_comparison_utils_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/math_utils_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/mixins_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/time_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/concurrency_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/util_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/widget_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/dialog_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/owl_dialog_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/core/dom_tests.js"></script>
+
+        <script type="text/javascript" src="/web/static/tests/chrome/action_manager_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/chrome/keyboard_navigation_mixin_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/chrome/menu_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/chrome/user_menu_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/chrome/systray_tests.js"></script>
+
+        <script type="text/javascript" src="/web/static/tests/components/custom_checkbox_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/components/custom_file_input_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/components/datepicker_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/components/pager_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/components/action_menus_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/components/dropdown_menu_tests.js"></script>
+
+        <script type="text/javascript" src="/web/static/tests/control_panel/control_panel_model_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/control_panel/control_panel_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/control_panel/favorite_menu_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/control_panel/custom_filter_item_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/control_panel/filter_menu_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/control_panel/custom_group_by_item_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/control_panel/groupby_menu_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/control_panel/search_bar_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/control_panel/time_range_menu_tests.js"></script>
+
+        <script type="text/javascript" src="/web/static/tests/widgets/company_switcher_tests.js"/>
+        <script type="text/javascript" src="/web/static/tests/widgets/data_export_tests.js"/>
+        <script type="text/javascript" src="/web/static/tests/widgets/domain_selector_tests.js"/>
+        <script type="text/javascript" src="/web/static/tests/widgets/model_field_selector_tests.js"/>
+        <script type="text/javascript" src="/web/static/tests/widgets/rainbow_man_tests.js"/>
+
+        <script type="text/javascript" src="/web/static/tests/tools/debug_manager_tests.js"/>
+
+        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_tests.js"></script>
+
+        <script type="text/javascript" src="/web/static/tests/owl_compatibility_tests.js"></script>
+    </template>
+
     <template id="web.qunit_mobile_suite">
         <t t-call="web.layout">
             <t t-set="html_data" t-value="{'style': 'height: 100%;'}"/>
             <t t-set="title">Web Mobile Tests</t>
             <t t-set="head">
                 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
-                <t t-call="web.js_tests_assets"/>
-                <script type="text/javascript" src="/web/static/lib/jquery.touchSwipe/jquery.touchSwipe.js"></script>
-
-                <script type="text/javascript" src="/web/static/tests/fields/basic_fields_mobile_tests.js"></script>
-                <script type="text/javascript" src="/web/static/tests/fields/relational_fields_mobile_tests.js"></script>
+                <t t-call-assets="web.qunit_mobile_suite_tests" t-js="false"/>
+                <t t-call-assets="web.qunit_mobile_suite_tests" t-css="false"/>
             </t>
-
             <div id="qunit"/>
             <div id="qunit-fixture"/>
         </t>
     </template>
 
+    <template id="web.qunit_mobile_suite_tests">
+        <t t-call="web.js_tests_assets"/>
+        <script type="text/javascript" src="/web/static/lib/jquery.touchSwipe/jquery.touchSwipe.js"></script>
+        <script type="text/javascript" src="/base/static/tests/base_settings_mobile_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/fields/basic_fields_mobile_tests.js"></script>
+        <script type="text/javascript" src="/web/static/tests/fields/relational_fields_mobile_tests.js"></script>
+    </template>
+
     <template id="web.benchmark_suite">
         <t t-call="web.layout">
             <t t-set="html_data" t-value="{'style': 'height: 100%;'}"/>