diff --git a/test/acceptance/aggregation.js b/test/acceptance/aggregation-test.js
similarity index 100%
rename from test/acceptance/aggregation.js
rename to test/acceptance/aggregation-test.js
diff --git a/test/acceptance/analysis/analyses-controller.js b/test/acceptance/analysis/analyses-controller-test.js
similarity index 100%
rename from test/acceptance/analysis/analyses-controller.js
rename to test/acceptance/analysis/analyses-controller-test.js
diff --git a/test/acceptance/analysis/analyses-filters-params.js b/test/acceptance/analysis/analyses-filters-params-test.js
similarity index 100%
rename from test/acceptance/analysis/analyses-filters-params.js
rename to test/acceptance/analysis/analyses-filters-params-test.js
diff --git a/test/acceptance/analysis/analyses-filters.js b/test/acceptance/analysis/analyses-filters-test.js
similarity index 100%
rename from test/acceptance/analysis/analyses-filters.js
rename to test/acceptance/analysis/analyses-filters-test.js
diff --git a/test/acceptance/analysis/analysis-layers-dataviews.js b/test/acceptance/analysis/analysis-layers-dataviews-test.js
similarity index 100%
rename from test/acceptance/analysis/analysis-layers-dataviews.js
rename to test/acceptance/analysis/analysis-layers-dataviews-test.js
diff --git a/test/acceptance/analysis/analysis-layers.js b/test/acceptance/analysis/analysis-layers-test.js
similarity index 100%
rename from test/acceptance/analysis/analysis-layers.js
rename to test/acceptance/analysis/analysis-layers-test.js
diff --git a/test/acceptance/analysis/analysis-layers-use-cases.js b/test/acceptance/analysis/analysis-layers-use-cases-test.js
similarity index 100%
rename from test/acceptance/analysis/analysis-layers-use-cases.js
rename to test/acceptance/analysis/analysis-layers-use-cases-test.js
diff --git a/test/acceptance/analysis/error-cases.js b/test/acceptance/analysis/error-cases-test.js
similarity index 100%
rename from test/acceptance/analysis/error-cases.js
rename to test/acceptance/analysis/error-cases-test.js
diff --git a/test/acceptance/analysis/named-maps.js b/test/acceptance/analysis/named-maps-test.js
similarity index 100%
rename from test/acceptance/analysis/named-maps.js
rename to test/acceptance/analysis/named-maps-test.js
diff --git a/test/acceptance/analysis/regressions.js b/test/acceptance/analysis/regressions-test.js
similarity index 100%
rename from test/acceptance/analysis/regressions.js
rename to test/acceptance/analysis/regressions-test.js
diff --git a/test/acceptance/auth/authorization-basic-use-cases.js b/test/acceptance/auth/authorization-basic-use-cases-test.js
similarity index 100%
rename from test/acceptance/auth/authorization-basic-use-cases.js
rename to test/acceptance/auth/authorization-basic-use-cases-test.js
diff --git a/test/acceptance/auth/authorization.js b/test/acceptance/auth/authorization-test.js
similarity index 100%
rename from test/acceptance/auth/authorization.js
rename to test/acceptance/auth/authorization-test.js
diff --git a/test/acceptance/buffer-size-format.js b/test/acceptance/buffer-size-format-test.js
similarity index 100%
rename from test/acceptance/buffer-size-format.js
rename to test/acceptance/buffer-size-format-test.js
diff --git a/test/acceptance/cache/cache-control-header.js b/test/acceptance/cache/cache-control-header-test.js
similarity index 100%
rename from test/acceptance/cache/cache-control-header.js
rename to test/acceptance/cache/cache-control-header-test.js
diff --git a/test/acceptance/cache/cache-headers.js b/test/acceptance/cache/cache-headers-test.js
similarity index 100%
rename from test/acceptance/cache/cache-headers.js
rename to test/acceptance/cache/cache-headers-test.js
diff --git a/test/acceptance/cache/surrogate-keys-invalidation.js b/test/acceptance/cache/surrogate-keys-invalidation-test.js
similarity index 100%
rename from test/acceptance/cache/surrogate-keys-invalidation.js
rename to test/acceptance/cache/surrogate-keys-invalidation-test.js
diff --git a/test/acceptance/cluster.js b/test/acceptance/cluster-test.js
similarity index 100%
rename from test/acceptance/cluster.js
rename to test/acceptance/cluster-test.js
diff --git a/test/acceptance/custom-middlewares.js b/test/acceptance/custom-middlewares-test.js
similarity index 100%
rename from test/acceptance/custom-middlewares.js
rename to test/acceptance/custom-middlewares-test.js
diff --git a/test/acceptance/dataviews/aggregation.js b/test/acceptance/dataviews/aggregation-test.js
similarity index 100%
rename from test/acceptance/dataviews/aggregation.js
rename to test/acceptance/dataviews/aggregation-test.js
diff --git a/test/acceptance/dataviews/error-cases.js b/test/acceptance/dataviews/error-cases-test.js
similarity index 100%
rename from test/acceptance/dataviews/error-cases.js
rename to test/acceptance/dataviews/error-cases-test.js
diff --git a/test/acceptance/dataviews/formula.js b/test/acceptance/dataviews/formula-test.js
similarity index 100%
rename from test/acceptance/dataviews/formula.js
rename to test/acceptance/dataviews/formula-test.js
diff --git a/test/acceptance/dataviews/histogram.js b/test/acceptance/dataviews/histogram-test.js
similarity index 100%
rename from test/acceptance/dataviews/histogram.js
rename to test/acceptance/dataviews/histogram-test.js
diff --git a/test/acceptance/dataviews/overviews.js b/test/acceptance/dataviews/overviews-test.js
similarity index 100%
rename from test/acceptance/dataviews/overviews.js
rename to test/acceptance/dataviews/overviews-test.js
diff --git a/test/acceptance/date-wrapping.spec.js b/test/acceptance/date-wrapping-test.js
similarity index 100%
rename from test/acceptance/date-wrapping.spec.js
rename to test/acceptance/date-wrapping-test.js
diff --git a/test/acceptance/dynamic-styling-named-maps.js b/test/acceptance/dynamic-styling-named-maps-test.js
similarity index 100%
rename from test/acceptance/dynamic-styling-named-maps.js
rename to test/acceptance/dynamic-styling-named-maps-test.js
diff --git a/test/acceptance/error-middleware.js b/test/acceptance/error-middleware-test.js
similarity index 100%
rename from test/acceptance/error-middleware.js
rename to test/acceptance/error-middleware-test.js
diff --git a/test/acceptance/errors-with-context.js b/test/acceptance/errors-with-context-test.js
similarity index 100%
rename from test/acceptance/errors-with-context.js
rename to test/acceptance/errors-with-context-test.js
diff --git a/test/acceptance/health-check.js b/test/acceptance/health-check-test.js
similarity index 100%
rename from test/acceptance/health-check.js
rename to test/acceptance/health-check-test.js
diff --git a/test/acceptance/label-wrap.js b/test/acceptance/label-wrap-test.js
similarity index 100%
rename from test/acceptance/label-wrap.js
rename to test/acceptance/label-wrap-test.js
diff --git a/test/acceptance/layergroup-metadata.js b/test/acceptance/layergroup-metadata-test.js
similarity index 100%
rename from test/acceptance/layergroup-metadata.js
rename to test/acceptance/layergroup-metadata-test.js
diff --git a/test/acceptance/layers-filters.js b/test/acceptance/layers-filters-test.js
similarity index 100%
rename from test/acceptance/layers-filters.js
rename to test/acceptance/layers-filters-test.js
diff --git a/test/acceptance/max-waiting-workers.js b/test/acceptance/max-waiting-workers-test.js
similarity index 100%
rename from test/acceptance/max-waiting-workers.js
rename to test/acceptance/max-waiting-workers-test.js
diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer-server-test.js
similarity index 100%
rename from test/acceptance/multilayer_server.js
rename to test/acceptance/multilayer-server-test.js
diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer-test.js
similarity index 100%
rename from test/acceptance/multilayer.js
rename to test/acceptance/multilayer-test.js
diff --git a/test/acceptance/mvt-regressions.js b/test/acceptance/mvt-regressions-test.js
similarity index 100%
rename from test/acceptance/mvt-regressions.js
rename to test/acceptance/mvt-regressions-test.js
diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt-test.js
similarity index 100%
rename from test/acceptance/mvt.js
rename to test/acceptance/mvt-test.js
diff --git a/test/acceptance/named-layers.js b/test/acceptance/named-layers-test.js
similarity index 100%
rename from test/acceptance/named-layers.js
rename to test/acceptance/named-layers-test.js
diff --git a/test/acceptance/named-layers-visibility.js b/test/acceptance/named-layers-visibility-test.js
similarity index 100%
rename from test/acceptance/named-layers-visibility.js
rename to test/acceptance/named-layers-visibility-test.js
diff --git a/test/acceptance/named-map-cache-regressions.js b/test/acceptance/named-map-cache-regressions-test.js
similarity index 100%
rename from test/acceptance/named-map-cache-regressions.js
rename to test/acceptance/named-map-cache-regressions-test.js
diff --git a/test/acceptance/named-maps-authentication.js b/test/acceptance/named-maps-authentication-test.js
similarity index 100%
rename from test/acceptance/named-maps-authentication.js
rename to test/acceptance/named-maps-authentication-test.js
diff --git a/test/acceptance/named-maps-cache.js b/test/acceptance/named-maps-cache-test.js
similarity index 100%
rename from test/acceptance/named-maps-cache.js
rename to test/acceptance/named-maps-cache-test.js
diff --git a/test/acceptance/named-maps-static-view.js b/test/acceptance/named-maps-static-view-test.js
similarity index 100%
rename from test/acceptance/named-maps-static-view.js
rename to test/acceptance/named-maps-static-view-test.js
diff --git a/test/acceptance/named-maps-stats.js b/test/acceptance/named-maps-stats-test.js
similarity index 100%
rename from test/acceptance/named-maps-stats.js
rename to test/acceptance/named-maps-stats-test.js
diff --git a/test/acceptance/overviews-metadata-named-maps.js b/test/acceptance/overviews-metadata-named-maps-test.js
similarity index 100%
rename from test/acceptance/overviews-metadata-named-maps.js
rename to test/acceptance/overviews-metadata-named-maps-test.js
diff --git a/test/acceptance/overviews-metadata.js b/test/acceptance/overviews-metadata-test.js
similarity index 100%
rename from test/acceptance/overviews-metadata.js
rename to test/acceptance/overviews-metadata-test.js
diff --git a/test/acceptance/overviews-queries.js b/test/acceptance/overviews-queries-test.js
similarity index 100%
rename from test/acceptance/overviews-queries.js
rename to test/acceptance/overviews-queries-test.js
diff --git a/test/acceptance/ported/attributes.js b/test/acceptance/ported/attributes-test.js
similarity index 100%
rename from test/acceptance/ported/attributes.js
rename to test/acceptance/ported/attributes-test.js
diff --git a/test/acceptance/ported/blend-filtering.js b/test/acceptance/ported/blend-filtering-test.js
similarity index 100%
rename from test/acceptance/ported/blend-filtering.js
rename to test/acceptance/ported/blend-filtering-test.js
diff --git a/test/acceptance/ported/blend-http-fallback.js b/test/acceptance/ported/blend-http-fallback-test.js
similarity index 100%
rename from test/acceptance/ported/blend-http-fallback.js
rename to test/acceptance/ported/blend-http-fallback-test.js
diff --git a/test/acceptance/ported/blend-http-timeout.js b/test/acceptance/ported/blend-http-timeout-test.js
similarity index 100%
rename from test/acceptance/ported/blend-http-timeout.js
rename to test/acceptance/ported/blend-http-timeout-test.js
diff --git a/test/acceptance/ported/blend.js b/test/acceptance/ported/blend-test.js
similarity index 100%
rename from test/acceptance/ported/blend.js
rename to test/acceptance/ported/blend-test.js
diff --git a/test/acceptance/ported/external-resources.js b/test/acceptance/ported/external-resources-test.js
similarity index 100%
rename from test/acceptance/ported/external-resources.js
rename to test/acceptance/ported/external-resources-test.js
diff --git a/test/acceptance/ported/limits.js b/test/acceptance/ported/limits-test.js
similarity index 100%
rename from test/acceptance/ported/limits.js
rename to test/acceptance/ported/limits-test.js
diff --git a/test/acceptance/ported/multilayer-error-cases.js b/test/acceptance/ported/multilayer-error-cases-test.js
similarity index 100%
rename from test/acceptance/ported/multilayer-error-cases.js
rename to test/acceptance/ported/multilayer-error-cases-test.js
diff --git a/test/acceptance/ported/multilayer-interactivity.js b/test/acceptance/ported/multilayer-interactivity-test.js
similarity index 100%
rename from test/acceptance/ported/multilayer-interactivity.js
rename to test/acceptance/ported/multilayer-interactivity-test.js
diff --git a/test/acceptance/ported/multilayer.js b/test/acceptance/ported/multilayer-test.js
similarity index 100%
rename from test/acceptance/ported/multilayer.js
rename to test/acceptance/ported/multilayer-test.js
diff --git a/test/acceptance/ported/raster.js b/test/acceptance/ported/raster-test.js
similarity index 100%
rename from test/acceptance/ported/raster.js
rename to test/acceptance/ported/raster-test.js
diff --git a/test/acceptance/ported/regressions.js b/test/acceptance/ported/regressions-test.js
similarity index 100%
rename from test/acceptance/ported/regressions.js
rename to test/acceptance/ported/regressions-test.js
diff --git a/test/acceptance/ported/retina.js b/test/acceptance/ported/retina-test.js
similarity index 100%
rename from test/acceptance/ported/retina.js
rename to test/acceptance/ported/retina-test.js
diff --git a/test/acceptance/ported/server-gettile.js b/test/acceptance/ported/server-gettile-test.js
similarity index 100%
rename from test/acceptance/ported/server-gettile.js
rename to test/acceptance/ported/server-gettile-test.js
diff --git a/test/acceptance/ported/server-png8-format.js b/test/acceptance/ported/server-png8-format-test.js
similarity index 100%
rename from test/acceptance/ported/server-png8-format.js
rename to test/acceptance/ported/server-png8-format-test.js
diff --git a/test/acceptance/ported/server.js b/test/acceptance/ported/server-test.js
similarity index 100%
rename from test/acceptance/ported/server.js
rename to test/acceptance/ported/server-test.js
diff --git a/test/acceptance/ported/static-maps.js b/test/acceptance/ported/static-maps-test.js
similarity index 100%
rename from test/acceptance/ported/static-maps.js
rename to test/acceptance/ported/static-maps-test.js
diff --git a/test/acceptance/ported/torque-boundaries.js b/test/acceptance/ported/torque-boundaries-test.js
similarity index 100%
rename from test/acceptance/ported/torque-boundaries.js
rename to test/acceptance/ported/torque-boundaries-test.js
diff --git a/test/acceptance/ported/torque-png.js b/test/acceptance/ported/torque-png-test.js
similarity index 100%
rename from test/acceptance/ported/torque-png.js
rename to test/acceptance/ported/torque-png-test.js
diff --git a/test/acceptance/ported/torque.js b/test/acceptance/ported/torque-test.js
similarity index 100%
rename from test/acceptance/ported/torque.js
rename to test/acceptance/ported/torque-test.js
diff --git a/test/acceptance/ported/torque-zero-zero.js b/test/acceptance/ported/torque-zero-zero-test.js
similarity index 100%
rename from test/acceptance/ported/torque-zero-zero.js
rename to test/acceptance/ported/torque-zero-zero-test.js
diff --git a/test/acceptance/ported/wrap.js b/test/acceptance/ported/wrap-test.js
similarity index 100%
rename from test/acceptance/ported/wrap.js
rename to test/acceptance/ported/wrap-test.js
diff --git a/test/acceptance/rate-limit.test.js b/test/acceptance/rate-limit-test.js
similarity index 100%
rename from test/acceptance/rate-limit.test.js
rename to test/acceptance/rate-limit-test.js
diff --git a/test/acceptance/regressions.js b/test/acceptance/regressions-test.js
similarity index 100%
rename from test/acceptance/regressions.js
rename to test/acceptance/regressions-test.js
diff --git a/test/acceptance/server.js b/test/acceptance/server-test.js
similarity index 100%
rename from test/acceptance/server.js
rename to test/acceptance/server-test.js
diff --git a/test/acceptance/special-numeric-values.js b/test/acceptance/special-numeric-values-test.js
similarity index 100%
rename from test/acceptance/special-numeric-values.js
rename to test/acceptance/special-numeric-values-test.js
diff --git a/test/acceptance/sql-wrap.js b/test/acceptance/sql-wrap-test.js
similarity index 100%
rename from test/acceptance/sql-wrap.js
rename to test/acceptance/sql-wrap-test.js
diff --git a/test/acceptance/stats/mapnik-stats-layergroup.js b/test/acceptance/stats/mapnik-stats-layergroup-test.js
similarity index 100%
rename from test/acceptance/stats/mapnik-stats-layergroup.js
rename to test/acceptance/stats/mapnik-stats-layergroup-test.js
diff --git a/test/acceptance/stats/multilayer-stats.js b/test/acceptance/stats/multilayer-stats-test.js
similarity index 100%
rename from test/acceptance/stats/multilayer-stats.js
rename to test/acceptance/stats/multilayer-stats-test.js
diff --git a/test/acceptance/templates.js b/test/acceptance/templates-test.js
similarity index 100%
rename from test/acceptance/templates.js
rename to test/acceptance/templates-test.js
diff --git a/test/acceptance/tilejson.js b/test/acceptance/tilejson-test.js
similarity index 100%
rename from test/acceptance/tilejson.js
rename to test/acceptance/tilejson-test.js
diff --git a/test/acceptance/turbo-carto/anonymous-maps.js b/test/acceptance/turbo-carto/anonymous-maps-test.js
similarity index 100%
rename from test/acceptance/turbo-carto/anonymous-maps.js
rename to test/acceptance/turbo-carto/anonymous-maps-test.js
diff --git a/test/acceptance/turbo-carto/error-cases.js b/test/acceptance/turbo-carto/error-cases-test.js
similarity index 100%
rename from test/acceptance/turbo-carto/error-cases.js
rename to test/acceptance/turbo-carto/error-cases-test.js
diff --git a/test/acceptance/turbo-carto/named-maps.js b/test/acceptance/turbo-carto/named-maps-test.js
similarity index 100%
rename from test/acceptance/turbo-carto/named-maps.js
rename to test/acceptance/turbo-carto/named-maps-test.js
diff --git a/test/acceptance/turbo-carto/regressions.js b/test/acceptance/turbo-carto/regressions-test.js
similarity index 100%
rename from test/acceptance/turbo-carto/regressions.js
rename to test/acceptance/turbo-carto/regressions-test.js
diff --git a/test/acceptance/user-database-timeout-limit.js b/test/acceptance/user-database-timeout-limit-test.js
similarity index 100%
rename from test/acceptance/user-database-timeout-limit.js
rename to test/acceptance/user-database-timeout-limit-test.js
diff --git a/test/acceptance/user-render-timeout-limit.js b/test/acceptance/user-render-timeout-limit-test.js
similarity index 100%
rename from test/acceptance/user-render-timeout-limit.js
rename to test/acceptance/user-render-timeout-limit-test.js
diff --git a/test/acceptance/vector-layergroup.js b/test/acceptance/vector-layergroup-test.js
similarity index 100%
rename from test/acceptance/vector-layergroup.js
rename to test/acceptance/vector-layergroup-test.js
diff --git a/test/acceptance/widgets/aggregation.js b/test/acceptance/widgets/aggregation-test.js
similarity index 100%
rename from test/acceptance/widgets/aggregation.js
rename to test/acceptance/widgets/aggregation-test.js
diff --git a/test/acceptance/widgets/histogram.js b/test/acceptance/widgets/histogram-test.js
similarity index 100%
rename from test/acceptance/widgets/histogram.js
rename to test/acceptance/widgets/histogram-test.js
diff --git a/test/acceptance/widgets/named-maps.js b/test/acceptance/widgets/named-maps-test.js
similarity index 100%
rename from test/acceptance/widgets/named-maps.js
rename to test/acceptance/widgets/named-maps-test.js
diff --git a/test/acceptance/widgets/ported/aggregation.js b/test/acceptance/widgets/ported/aggregation-test.js
similarity index 100%
rename from test/acceptance/widgets/ported/aggregation.js
rename to test/acceptance/widgets/ported/aggregation-test.js
diff --git a/test/acceptance/widgets/ported/formula.js b/test/acceptance/widgets/ported/formula-test.js
similarity index 100%
rename from test/acceptance/widgets/ported/formula.js
rename to test/acceptance/widgets/ported/formula-test.js
diff --git a/test/acceptance/widgets/ported/histogram.js b/test/acceptance/widgets/ported/histogram-test.js
similarity index 100%
rename from test/acceptance/widgets/ported/histogram.js
rename to test/acceptance/widgets/ported/histogram-test.js
diff --git a/test/acceptance/widgets/regressions.js b/test/acceptance/widgets/regressions-test.js
similarity index 100%
rename from test/acceptance/widgets/regressions.js
rename to test/acceptance/widgets/regressions-test.js
diff --git a/test/acceptance/widgets/widgets.js b/test/acceptance/widgets/widgets-test.js
similarity index 100%
rename from test/acceptance/widgets/widgets.js
rename to test/acceptance/widgets/widgets-test.js
diff --git a/test/integration/analysis-backend-limits.js b/test/integration/analysis-backend-limits-test.js
similarity index 100%
rename from test/integration/analysis-backend-limits.js
rename to test/integration/analysis-backend-limits-test.js
diff --git a/test/integration/mapconfig-named-layers-datasource.js b/test/integration/mapconfig-named-layers-datasource-test.js
similarity index 100%
rename from test/integration/mapconfig-named-layers-datasource.js
rename to test/integration/mapconfig-named-layers-datasource-test.js
diff --git a/test/integration/mapconfig-named-layers-expanded.js b/test/integration/mapconfig-named-layers-expanded-test.js
similarity index 100%
rename from test/integration/mapconfig-named-layers-expanded.js
rename to test/integration/mapconfig-named-layers-expanded-test.js
diff --git a/test/integration/mapconfig-overviews-adapter.js b/test/integration/mapconfig-overviews-adapter-test.js
similarity index 100%
rename from test/integration/mapconfig-overviews-adapter.js
rename to test/integration/mapconfig-overviews-adapter-test.js
diff --git a/test/integration/overviews-metadata-api.js b/test/integration/overviews-metadata-api-test.js
similarity index 100%
rename from test/integration/overviews-metadata-api.js
rename to test/integration/overviews-metadata-api-test.js
diff --git a/test/integration/pg-query-runner.js b/test/integration/pg-query-runner-test.js
similarity index 100%
rename from test/integration/pg-query-runner.js
rename to test/integration/pg-query-runner-test.js
diff --git a/test/integration/profiler.js b/test/integration/profiler-test.js
similarity index 100%
rename from test/integration/profiler.js
rename to test/integration/profiler-test.js
diff --git a/test/integration/query-tables.js b/test/integration/query-tables-test.js
similarity index 100%
rename from test/integration/query-tables.js
rename to test/integration/query-tables-test.js
diff --git a/test/integration/template-maps-limits.js b/test/integration/template-maps-limits-test.js
similarity index 100%
rename from test/integration/template-maps-limits.js
rename to test/integration/template-maps-limits-test.js
diff --git a/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js b/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats-test.js
similarity index 100%
rename from test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js
rename to test/unit/cartodb/backends/layer-stats/mapnik-layer-stats-test.js
diff --git a/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js b/test/unit/cartodb/backends/layer-stats/torque-layer-stats-test.js
similarity index 100%
rename from test/unit/cartodb/backends/layer-stats/torque-layer-stats.js
rename to test/unit/cartodb/backends/layer-stats/torque-layer-stats-test.js
diff --git a/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js b/test/unit/cartodb/backends/turbo-carto-postgres-datasource-test.js
similarity index 100%
rename from test/unit/cartodb/backends/turbo-carto-postgres-datasource.js
rename to test/unit/cartodb/backends/turbo-carto-postgres-datasource-test.js
diff --git a/test/unit/cartodb/overviews-query-rewriter.js b/test/unit/cartodb/overviews-query-rewriter-test.js
similarity index 100%
rename from test/unit/cartodb/overviews-query-rewriter.js
rename to test/unit/cartodb/overviews-query-rewriter-test.js
diff --git a/test/unit/cartodb/stats/reporter/named-map-provider.js b/test/unit/cartodb/stats/reporter/named-map-provider-test.js
similarity index 100%
rename from test/unit/cartodb/stats/reporter/named-map-provider.js
rename to test/unit/cartodb/stats/reporter/named-map-provider-test.js
diff --git a/test/unit/cartodb/table-name-parser.js b/test/unit/cartodb/table-name-parser-test.js
similarity index 100%
rename from test/unit/cartodb/table-name-parser.js
rename to test/unit/cartodb/table-name-parser-test.js