diff --git a/extensions/mistral/test/js/workbookSpec.js b/extensions/mistral/test/js/workbook.model.spec.js
similarity index 100%
rename from extensions/mistral/test/js/workbookSpec.js
rename to extensions/mistral/test/js/workbook.model.spec.js
diff --git a/karma-unit.conf.js b/karma-unit.conf.js
index 1990664..ae9e6ba 100644
--- a/karma-unit.conf.js
+++ b/karma-unit.conf.js
@@ -48,12 +48,11 @@ module.exports = function (config) {
       'merlin/static/merlin/js/merlin.init.js',
       'merlin/static/merlin/js/merlin.*.js',
       'merlin/static/merlin/templates/**/*.html',
-      'merlin/test/js/*Spec.js',
+      'merlin/test/js/*.spec.js',
       // explicitly require first module definition file to avoid errors
       'extensions/mistral/static/mistral/js/mistral.init.js',
       'extensions/mistral/static/mistral/js/mistral.*.js',
-      'extensions/mistral/test/js/*Spec.js',
-      'extensions/mistral/test/js/*spec.js'
+      'extensions/mistral/test/js/*.spec.js'
     ],
 
     preprocessors: {
diff --git a/merlin/test/js/directivesSpec.js b/merlin/test/js/merlin.directives.spec.js
similarity index 100%
rename from merlin/test/js/directivesSpec.js
rename to merlin/test/js/merlin.directives.spec.js
diff --git a/merlin/test/js/filtersSpec.js b/merlin/test/js/merlin.filters.spec.js
similarity index 100%
rename from merlin/test/js/filtersSpec.js
rename to merlin/test/js/merlin.filters.spec.js
diff --git a/merlin/test/js/modelsSpec.js b/merlin/test/js/merlin.models.spec.js
similarity index 100%
rename from merlin/test/js/modelsSpec.js
rename to merlin/test/js/merlin.models.spec.js
diff --git a/merlin/test/js/templatesSpec.js b/merlin/test/js/merlin.templates.spec.js
similarity index 100%
rename from merlin/test/js/templatesSpec.js
rename to merlin/test/js/merlin.templates.spec.js
diff --git a/merlin/test/js/utilsSpec.js b/merlin/test/js/merlin.utils.spec.js
similarity index 100%
rename from merlin/test/js/utilsSpec.js
rename to merlin/test/js/merlin.utils.spec.js