diff --git a/addons/account/static/test/reconciliation_tests.js b/addons/account/static/tests/reconciliation_tests.js
similarity index 100%
rename from addons/account/static/test/reconciliation_tests.js
rename to addons/account/static/tests/reconciliation_tests.js
diff --git a/addons/account/views/account.xml b/addons/account/views/account.xml
index 889e732967b..4481d863979 100644
--- a/addons/account/views/account.xml
+++ b/addons/account/views/account.xml
@@ -17,8 +17,8 @@
     </template>
 
     <template id="qunit_suite" name="account_reconciliation tests" inherit_id="web.qunit_suite">
-        <xpath expr="//script[contains(@src, '/web/static/test/views/kanban_tests.js')]" position="after">
-            <script type="text/javascript" src="/account/static/test/reconciliation_tests.js"></script>
+        <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>
         </xpath>
     </template>
 </odoo>
diff --git a/addons/web/Gruntfile.js b/addons/web/Gruntfile.js
index f964df4dae2..43b58c3b64b 100644
--- a/addons/web/Gruntfile.js
+++ b/addons/web/Gruntfile.js
@@ -2,7 +2,7 @@ module.exports = function(grunt) {
 
     grunt.initConfig({
         jshint: {
-            src: ['static/src/**/*.js', 'static/test/**/*.js'],
+            src: ['static/src/**/*.js', 'static/tests/**/*.js'],
             options: {
                 sub: true, //[] instead of .
                 evil: true, //eval
diff --git a/addons/web/static/test/boot_tests.js b/addons/web/static/tests/boot_tests.js
similarity index 100%
rename from addons/web/static/test/boot_tests.js
rename to addons/web/static/tests/boot_tests.js
diff --git a/addons/web/static/test/chrome/pager_tests.js b/addons/web/static/tests/chrome/pager_tests.js
similarity index 100%
rename from addons/web/static/test/chrome/pager_tests.js
rename to addons/web/static/tests/chrome/pager_tests.js
diff --git a/addons/web/static/test/chrome/search_tests.js b/addons/web/static/tests/chrome/search_tests.js
similarity index 100%
rename from addons/web/static/test/chrome/search_tests.js
rename to addons/web/static/tests/chrome/search_tests.js
diff --git a/addons/web/static/test/core/class_tests.js b/addons/web/static/tests/core/class_tests.js
similarity index 100%
rename from addons/web/static/test/core/class_tests.js
rename to addons/web/static/tests/core/class_tests.js
diff --git a/addons/web/static/test/core/concurrency_tests.js b/addons/web/static/tests/core/concurrency_tests.js
similarity index 100%
rename from addons/web/static/test/core/concurrency_tests.js
rename to addons/web/static/tests/core/concurrency_tests.js
diff --git a/addons/web/static/test/core/domain_tests.js b/addons/web/static/tests/core/domain_tests.js
similarity index 100%
rename from addons/web/static/test/core/domain_tests.js
rename to addons/web/static/tests/core/domain_tests.js
diff --git a/addons/web/static/test/core/pyeval_tests.js b/addons/web/static/tests/core/pyeval_tests.js
similarity index 100%
rename from addons/web/static/test/core/pyeval_tests.js
rename to addons/web/static/tests/core/pyeval_tests.js
diff --git a/addons/web/static/test/core/registry_tests.js b/addons/web/static/tests/core/registry_tests.js
similarity index 100%
rename from addons/web/static/test/core/registry_tests.js
rename to addons/web/static/tests/core/registry_tests.js
diff --git a/addons/web/static/test/core/rpc_tests.js b/addons/web/static/tests/core/rpc_tests.js
similarity index 100%
rename from addons/web/static/test/core/rpc_tests.js
rename to addons/web/static/tests/core/rpc_tests.js
diff --git a/addons/web/static/test/core/time_tests.js b/addons/web/static/tests/core/time_tests.js
similarity index 100%
rename from addons/web/static/test/core/time_tests.js
rename to addons/web/static/tests/core/time_tests.js
diff --git a/addons/web/static/test/core/util_tests.js b/addons/web/static/tests/core/util_tests.js
similarity index 100%
rename from addons/web/static/test/core/util_tests.js
rename to addons/web/static/tests/core/util_tests.js
diff --git a/addons/web/static/test/core/widget_tests.js b/addons/web/static/tests/core/widget_tests.js
similarity index 100%
rename from addons/web/static/test/core/widget_tests.js
rename to addons/web/static/tests/core/widget_tests.js
diff --git a/addons/web/static/test/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js
similarity index 100%
rename from addons/web/static/test/fields/basic_fields_tests.js
rename to addons/web/static/tests/fields/basic_fields_tests.js
diff --git a/addons/web/static/test/fields/field_utils_tests.js b/addons/web/static/tests/fields/field_utils_tests.js
similarity index 100%
rename from addons/web/static/test/fields/field_utils_tests.js
rename to addons/web/static/tests/fields/field_utils_tests.js
diff --git a/addons/web/static/test/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
similarity index 100%
rename from addons/web/static/test/fields/relational_fields_tests.js
rename to addons/web/static/tests/fields/relational_fields_tests.js
diff --git a/addons/web/static/test/helpers/mock_server.js b/addons/web/static/tests/helpers/mock_server.js
similarity index 100%
rename from addons/web/static/test/helpers/mock_server.js
rename to addons/web/static/tests/helpers/mock_server.js
diff --git a/addons/web/static/test/helpers/qunit_config.js b/addons/web/static/tests/helpers/qunit_config.js
similarity index 100%
rename from addons/web/static/test/helpers/qunit_config.js
rename to addons/web/static/tests/helpers/qunit_config.js
diff --git a/addons/web/static/test/helpers/test_utils.js b/addons/web/static/tests/helpers/test_utils.js
similarity index 100%
rename from addons/web/static/test/helpers/test_utils.js
rename to addons/web/static/tests/helpers/test_utils.js
diff --git a/addons/web/static/test/views/basic_model_tests.js b/addons/web/static/tests/views/basic_model_tests.js
similarity index 100%
rename from addons/web/static/test/views/basic_model_tests.js
rename to addons/web/static/tests/views/basic_model_tests.js
diff --git a/addons/web/static/test/views/calendar_tests.js b/addons/web/static/tests/views/calendar_tests.js
similarity index 100%
rename from addons/web/static/test/views/calendar_tests.js
rename to addons/web/static/tests/views/calendar_tests.js
diff --git a/addons/web/static/test/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
similarity index 100%
rename from addons/web/static/test/views/form_tests.js
rename to addons/web/static/tests/views/form_tests.js
diff --git a/addons/web/static/test/views/graph_tests.js b/addons/web/static/tests/views/graph_tests.js
similarity index 100%
rename from addons/web/static/test/views/graph_tests.js
rename to addons/web/static/tests/views/graph_tests.js
diff --git a/addons/web/static/test/views/kanban_model_tests.js b/addons/web/static/tests/views/kanban_model_tests.js
similarity index 100%
rename from addons/web/static/test/views/kanban_model_tests.js
rename to addons/web/static/tests/views/kanban_model_tests.js
diff --git a/addons/web/static/test/views/kanban_tests.js b/addons/web/static/tests/views/kanban_tests.js
similarity index 100%
rename from addons/web/static/test/views/kanban_tests.js
rename to addons/web/static/tests/views/kanban_tests.js
diff --git a/addons/web/static/test/views/list_tests.js b/addons/web/static/tests/views/list_tests.js
similarity index 100%
rename from addons/web/static/test/views/list_tests.js
rename to addons/web/static/tests/views/list_tests.js
diff --git a/addons/web/static/test/views/pivot_tests.js b/addons/web/static/tests/views/pivot_tests.js
similarity index 100%
rename from addons/web/static/test/views/pivot_tests.js
rename to addons/web/static/tests/views/pivot_tests.js
diff --git a/addons/web/static/test/views/view_dialogs_tests.js b/addons/web/static/tests/views/view_dialogs_tests.js
similarity index 100%
rename from addons/web/static/test/views/view_dialogs_tests.js
rename to addons/web/static/tests/views/view_dialogs_tests.js
diff --git a/addons/web/static/test/widgets/domain_selector_tests.js b/addons/web/static/tests/widgets/domain_selector_tests.js
similarity index 100%
rename from addons/web/static/test/widgets/domain_selector_tests.js
rename to addons/web/static/tests/widgets/domain_selector_tests.js
diff --git a/addons/web/static/test/widgets/model_field_selector_tests.js b/addons/web/static/tests/widgets/model_field_selector_tests.js
similarity index 100%
rename from addons/web/static/test/widgets/model_field_selector_tests.js
rename to addons/web/static/tests/widgets/model_field_selector_tests.js
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index f3fbcdb51a5..47db318fd30 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -395,7 +395,7 @@
             <t t-set="head">
                 <link type="text/css" rel="stylesheet" href="/web/static/lib/qunit/qunit-2.2.1.css"/>
                 <script type="text/javascript" src="/web/static/lib/qunit/qunit-2.2.1.js"></script>
-                <script type="text/javascript" src="/web/static/test/helpers/qunit_config.js"></script>
+                <script type="text/javascript" src="/web/static/tests/helpers/qunit_config.js"></script>
 
                 <t t-call-assets="web.assets_common" t-js="false"/>
                 <t t-call-assets="web.assets_backend" t-js="false"/>
@@ -425,40 +425,40 @@
                         display: inherit;
                     }
                 </style>
-                <script type="text/javascript" src="/web/static/test/helpers/test_utils.js"></script>
-                <script type="text/javascript" src="/web/static/test/helpers/mock_server.js"></script>
+                <script type="text/javascript" src="/web/static/tests/helpers/test_utils.js"></script>
+                <script type="text/javascript" src="/web/static/tests/helpers/mock_server.js"></script>
 
-                <script type="text/javascript" src="/web/static/test/fields/basic_fields_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/fields/field_utils_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/fields/relational_fields_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/test/views/form_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/views/graph_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/views/list_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/views/pivot_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/views/kanban_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/views/calendar_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/views/basic_model_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/views/kanban_model_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/views/view_dialogs_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/basic_model_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/test/core/registry_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/core/pyeval_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/core/class_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/core/rpc_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/core/domain_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/core/time_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/core/concurrency_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/core/util_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/core/widget_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/pyeval_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/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/test/chrome/search_tests.js"></script>
-                <script type="text/javascript" src="/web/static/test/chrome/pager_tests.js"></script>
+                <script type="text/javascript" src="/web/static/tests/chrome/search_tests.js"></script>
+                <script type="text/javascript" src="/web/static/tests/chrome/pager_tests.js"></script>
 
-                <script type="text/javascript" src="/web/static/test/widgets/domain_selector_tests.js"/>
-                <script type="text/javascript" src="/web/static/test/widgets/model_field_selector_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/test/boot_tests.js"></script>
+                <script type="text/javascript" src="/web/static/tests/boot_tests.js"></script>
             </t>
 
             <div id="qunit"/>
diff --git a/addons/web_diagram/views/web_diagram_templates.xml b/addons/web_diagram/views/web_diagram_templates.xml
index 7ccf5e28a61..1e56c8abbe1 100644
--- a/addons/web_diagram/views/web_diagram_templates.xml
+++ b/addons/web_diagram/views/web_diagram_templates.xml
@@ -15,7 +15,7 @@
         </template>
 
         <template id="qunit_suite" name="web_diagram tests" inherit_id="web.qunit_suite">
-            <xpath expr="//script[contains(@src, '/web/static/test/views/kanban_tests.js')]" position="after">
+            <xpath expr="//script[contains(@src, '/web/static/tests/views/kanban_tests.js')]" position="after">
                 <script type="text/javascript" src="/web_diagram/static/tests/diagram_tests.js"></script>
             </xpath>
         </template>
diff --git a/doc/reference/javascript.rst b/doc/reference/javascript.rst
index 2a1e2b3a018..25b64bc8b05 100644
--- a/doc/reference/javascript.rst
+++ b/doc/reference/javascript.rst
@@ -869,7 +869,7 @@ The first step is to list the test file(s). This is done through the
         'name': "Demonstration of web/javascript tests",
         'category': 'Hidden',
         'depends': ['web'],
-        'test': ['static/test/demo.js'],
+        'test': ['static/tests/demo.js'],
     }
 
 and to create the corresponding test file(s)
@@ -989,7 +989,7 @@ test module:
         'category': 'Hidden',
         'depends': ['web'],
         'js': ['static/src/js/demo.js'],
-        'test': ['static/test/demo.js'],
+        'test': ['static/tests/demo.js'],
     }
 
 ::
@@ -1066,7 +1066,7 @@ qweb before running the test case:
         'category': 'Hidden',
         'depends': ['web'],
         'js': ['static/src/js/demo.js'],
-        'test': ['static/test/demo.js'],
+        'test': ['static/tests/demo.js'],
         'qweb': ['static/src/xml/demo.xml'],
     }
 
diff --git a/odoo/addons/test_new_api/static/test/x2many.js b/odoo/addons/test_new_api/static/tests/x2many.js
similarity index 100%
rename from odoo/addons/test_new_api/static/test/x2many.js
rename to odoo/addons/test_new_api/static/tests/x2many.js
diff --git a/odoo/addons/test_new_api/template.xml b/odoo/addons/test_new_api/template.xml
index cc3c1562c7b..f62d3d47f20 100644
--- a/odoo/addons/test_new_api/template.xml
+++ b/odoo/addons/test_new_api/template.xml
@@ -2,7 +2,7 @@
 <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/test/x2many.js"></script>
+            <script type="text/javascript" src="/test_new_api/static/tests/x2many.js"></script>
         </xpath>
     </template>
 </odoo>