diff --git a/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats-test.js b/test/unit/backends/layer-stats/mapnik-layer-stats-test.js
similarity index 98%
rename from test/unit/cartodb/backends/layer-stats/mapnik-layer-stats-test.js
rename to test/unit/backends/layer-stats/mapnik-layer-stats-test.js
index 7106e60f..6860a781 100644
--- a/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats-test.js
+++ b/test/unit/backends/layer-stats/mapnik-layer-stats-test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var assert = require('assert');
-var MapnikLayerStats = require('../../../../../lib/backends/layer-stats/mapnik-layer-stats');
+var MapnikLayerStats = require('../../../../lib/backends/layer-stats/mapnik-layer-stats');
 var MapConfig = require('windshaft').model.MapConfig;
 
 function getDbConnectionMock () {
diff --git a/test/unit/cartodb/backends/layer-stats/torque-layer-stats-test.js b/test/unit/backends/layer-stats/torque-layer-stats-test.js
similarity index 91%
rename from test/unit/cartodb/backends/layer-stats/torque-layer-stats-test.js
rename to test/unit/backends/layer-stats/torque-layer-stats-test.js
index a6638610..6156bbe6 100644
--- a/test/unit/cartodb/backends/layer-stats/torque-layer-stats-test.js
+++ b/test/unit/backends/layer-stats/torque-layer-stats-test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var assert = require('assert');
-var TorqueLayerStats = require('../../../../../lib/backends/layer-stats/torque-layer-stats');
+var TorqueLayerStats = require('../../../../lib/backends/layer-stats/torque-layer-stats');
 var MapConfig = require('windshaft').model.MapConfig;
 
 describe('torque-layer-stats', function () {
diff --git a/test/unit/cartodb/backends/turbo-carto-postgres-datasource-test.js b/test/unit/backends/turbo-carto-postgres-datasource-test.js
similarity index 94%
rename from test/unit/cartodb/backends/turbo-carto-postgres-datasource-test.js
rename to test/unit/backends/turbo-carto-postgres-datasource-test.js
index 420edf7f..303517e1 100644
--- a/test/unit/cartodb/backends/turbo-carto-postgres-datasource-test.js
+++ b/test/unit/backends/turbo-carto-postgres-datasource-test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var PostgresDatasource = require('../../../../lib/backends/turbo-carto-postgres-datasource');
+var PostgresDatasource = require('../../../lib/backends/turbo-carto-postgres-datasource');
 var PSQL = require('cartodb-psql');
 var _ = require('underscore');
 var assert = require('assert');
diff --git a/test/unit/cartodb/cache/model/named-maps-entry-test.js b/test/unit/cache/model/named-maps-entry-test.js
similarity index 86%
rename from test/unit/cartodb/cache/model/named-maps-entry-test.js
rename to test/unit/cache/model/named-maps-entry-test.js
index e8e7ccc0..69ba81b2 100644
--- a/test/unit/cartodb/cache/model/named-maps-entry-test.js
+++ b/test/unit/cache/model/named-maps-entry-test.js
@@ -1,10 +1,10 @@
 'use strict';
 
-require('../../../../support/test-helper');
+require('../../../support/test-helper');
 
 var assert = require('assert');
 var _ = require('underscore');
-var NamedMapsCacheEntry = require('../../../../../lib/cache/model/named-maps-entry');
+var NamedMapsCacheEntry = require('../../../../lib/cache/model/named-maps-entry');
 
 describe('cache named maps entry', function() {
 
diff --git a/test/unit/cartodb/cdb-request-test.js b/test/unit/cdb-request-test.js
similarity index 96%
rename from test/unit/cartodb/cdb-request-test.js
rename to test/unit/cdb-request-test.js
index 8a9e8278..49b1253b 100644
--- a/test/unit/cartodb/cdb-request-test.js
+++ b/test/unit/cdb-request-test.js
@@ -1,9 +1,9 @@
 'use strict';
 
-require('../../support/test-helper');
+require('../support/test-helper');
 var assert = require('assert');
 
-var CdbRequest = require('../../../lib/models/cdb-request');
+var CdbRequest = require('../../lib/models/cdb-request');
 
 describe('req2params', function() {
 
diff --git a/test/unit/cartodb/error-messages-test.js b/test/unit/error-messages-test.js
similarity index 86%
rename from test/unit/cartodb/error-messages-test.js
rename to test/unit/error-messages-test.js
index f29422f1..86b3b43a 100644
--- a/test/unit/cartodb/error-messages-test.js
+++ b/test/unit/error-messages-test.js
@@ -1,10 +1,10 @@
 'use strict';
 
-require('../../support/test-helper');
+require('../support/test-helper');
 
 var assert = require('assert');
 
-var errorMiddleware = require('../../../lib/api/middlewares/error-middleware');
+var errorMiddleware = require('../../lib/api/middlewares/error-middleware');
 
 describe('error messages clean up', function() {
 
diff --git a/test/unit/cartodb/error-middleware-test.js b/test/unit/error-middleware-test.js
similarity index 97%
rename from test/unit/cartodb/error-middleware-test.js
rename to test/unit/error-middleware-test.js
index 5333b6c3..d7670c6a 100644
--- a/test/unit/cartodb/error-middleware-test.js
+++ b/test/unit/error-middleware-test.js
@@ -1,9 +1,9 @@
 'use strict';
 
-require('../../support/test-helper');
+require('../support/test-helper');
 
 var assert = require('assert');
-var errorMiddleware = require('../../../lib/api/middlewares/error-middleware');
+var errorMiddleware = require('../../lib/api/middlewares/error-middleware');
 
 describe('error-middleware', function() {
 
diff --git a/test/unit/cartodb/lzma-middleware-test.js b/test/unit/lzma-middleware-test.js
similarity index 89%
rename from test/unit/cartodb/lzma-middleware-test.js
rename to test/unit/lzma-middleware-test.js
index 99229528..b176a207 100644
--- a/test/unit/cartodb/lzma-middleware-test.js
+++ b/test/unit/lzma-middleware-test.js
@@ -1,9 +1,9 @@
 'use strict';
 
 var assert = require('assert');
-var testHelper = require('../../support/test-helper');
+var testHelper = require('../support/test-helper');
 
-var lzmaMiddleware = require('../../../lib/api/middlewares/lzma');
+var lzmaMiddleware = require('../../lib/api/middlewares/lzma');
 
 describe('lzma-middleware', function() {
 
diff --git a/test/unit/cartodb/mapconfig/adapter-test.js b/test/unit/mapconfig/adapter-test.js
similarity index 97%
rename from test/unit/cartodb/mapconfig/adapter-test.js
rename to test/unit/mapconfig/adapter-test.js
index c748ee14..5adeb4a5 100644
--- a/test/unit/cartodb/mapconfig/adapter-test.js
+++ b/test/unit/mapconfig/adapter-test.js
@@ -3,7 +3,7 @@
 //require('../../../support/test-helper');
 var assert = require('assert');
 
-var MapConfigAdapter = require('../../../../lib/models/mapconfig/adapter');
+var MapConfigAdapter = require('../../../lib/models/mapconfig/adapter');
 
 describe('MapConfigAdapter', function() {
     var user = 'wadus';
diff --git a/test/unit/cartodb/mapconfig/dataviews-widgets-adapter-test.js b/test/unit/mapconfig/dataviews-widgets-adapter-test.js
similarity index 98%
rename from test/unit/cartodb/mapconfig/dataviews-widgets-adapter-test.js
rename to test/unit/mapconfig/dataviews-widgets-adapter-test.js
index 87f4fabe..1b1e657b 100644
--- a/test/unit/cartodb/mapconfig/dataviews-widgets-adapter-test.js
+++ b/test/unit/mapconfig/dataviews-widgets-adapter-test.js
@@ -3,7 +3,7 @@
 //require('../../../support/test-helper');
 var assert = require('assert');
 
-var DataviewsMapConfigAdapter = require('../../../../lib/models/mapconfig/adapter/dataviews-widgets-adapter');
+var DataviewsMapConfigAdapter = require('../../../lib/models/mapconfig/adapter/dataviews-widgets-adapter');
 
 describe('dataviews-widgets-adapter', function() {
 
diff --git a/test/unit/cartodb/middlewares/coordinates-test.js b/test/unit/middlewares/coordinates-test.js
similarity index 98%
rename from test/unit/cartodb/middlewares/coordinates-test.js
rename to test/unit/middlewares/coordinates-test.js
index ca13d6a3..f2f94357 100644
--- a/test/unit/cartodb/middlewares/coordinates-test.js
+++ b/test/unit/middlewares/coordinates-test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const assert = require('assert');
-const coordinates = require('../../../../lib/api/middlewares/coordinates');
+const coordinates = require('../../../lib/api/middlewares/coordinates');
 
 describe('coordinates middleware', function () {
     it('should return error: invalid zoom paramenter (-1)', function (done) {
diff --git a/test/unit/cartodb/model/filter/bbox-filters-test.js b/test/unit/model/filter/bbox-filters-test.js
similarity index 96%
rename from test/unit/cartodb/model/filter/bbox-filters-test.js
rename to test/unit/model/filter/bbox-filters-test.js
index c281c384..6e5100a6 100644
--- a/test/unit/cartodb/model/filter/bbox-filters-test.js
+++ b/test/unit/model/filter/bbox-filters-test.js
@@ -1,10 +1,10 @@
 'use strict';
 
-require('../../../../support/test-helper');
+require('../../../support/test-helper');
 var util = require('util');
 
-var assert = require('../../../../support/assert');
-var BboxFilter = require('../../../../../lib/models/filter/bbox');
+var assert = require('../../../support/assert');
+var BboxFilter = require('../../../../lib/models/filter/bbox');
 
 var MAX_EXTENT_MERCATOR_REF = [
     -BboxFilter.LONGITUDE_MAX_VALUE,
diff --git a/test/unit/cartodb/model/resource-locator-test.js b/test/unit/model/resource-locator-test.js
similarity index 98%
rename from test/unit/cartodb/model/resource-locator-test.js
rename to test/unit/model/resource-locator-test.js
index 3ff4995c..b26ebf54 100644
--- a/test/unit/cartodb/model/resource-locator-test.js
+++ b/test/unit/model/resource-locator-test.js
@@ -1,9 +1,9 @@
 'use strict';
 
-require('../../../support/test-helper');
+require('../../support/test-helper');
 
-var assert = require('../../../support/assert');
-var ResourceLocator = require('../../../../lib/models/resource-locator');
+var assert = require('../../support/assert');
+var ResourceLocator = require('../../../lib/models/resource-locator');
 
 describe('ResourceLocator', function() {
     var USERNAME = 'username';
diff --git a/test/unit/cartodb/overviews-query-rewriter-test.js b/test/unit/overviews-query-rewriter-test.js
similarity index 99%
rename from test/unit/cartodb/overviews-query-rewriter-test.js
rename to test/unit/overviews-query-rewriter-test.js
index ff06297f..4b54d426 100644
--- a/test/unit/cartodb/overviews-query-rewriter-test.js
+++ b/test/unit/overviews-query-rewriter-test.js
@@ -1,9 +1,9 @@
 'use strict';
 
-require('../../support/test-helper');
+require('../support/test-helper');
 
 var assert           = require('assert');
-var OverviewsQueryRewriter = require('../../../lib/utils/overviews-query-rewriter');
+var OverviewsQueryRewriter = require('../../lib/utils/overviews-query-rewriter');
 var overviewsQueryRewriter = new OverviewsQueryRewriter({
     zoom_level: 'ZoomLevel()'
 });
diff --git a/test/unit/cartodb/ported/profiler-test.js b/test/unit/ported/profiler-test.js
similarity index 82%
rename from test/unit/cartodb/ported/profiler-test.js
rename to test/unit/ported/profiler-test.js
index e7161cb7..5dcedf9a 100644
--- a/test/unit/cartodb/ported/profiler-test.js
+++ b/test/unit/ported/profiler-test.js
@@ -1,9 +1,9 @@
 'use strict';
 
-require('../../../support/test-helper');
+require('../../support/test-helper');
 
 var assert = require('assert');
-var ProfilerProxy = require('../../../../lib/stats/profiler-proxy');
+var ProfilerProxy = require('../../../lib/stats/profiler-proxy');
 
 describe('profiler', function() {
 
diff --git a/test/unit/cartodb/ported/stats-client-test.js b/test/unit/ported/stats-client-test.js
similarity index 92%
rename from test/unit/cartodb/ported/stats-client-test.js
rename to test/unit/ported/stats-client-test.js
index 2b0d48d9..dba123b5 100644
--- a/test/unit/cartodb/ported/stats-client-test.js
+++ b/test/unit/ported/stats-client-test.js
@@ -1,10 +1,10 @@
 'use strict';
 
-require('../../../support/test-helper');
+require('../../support/test-helper');
 
 var assert = require('assert');
 
-var StatsClient = require('../../../../lib/stats/client');
+var StatsClient = require('../../../lib/stats/client');
 
 describe('stats client', function() {
     var statsInstance;
diff --git a/test/unit/cartodb/ported/windshaft-server-test.js b/test/unit/ported/windshaft-server-test.js
similarity index 85%
rename from test/unit/cartodb/ported/windshaft-server-test.js
rename to test/unit/ported/windshaft-server-test.js
index 7cebcdae..3085c266 100644
--- a/test/unit/cartodb/ported/windshaft-server-test.js
+++ b/test/unit/ported/windshaft-server-test.js
@@ -1,10 +1,10 @@
 'use strict';
 
-require('../../../support/test-helper');
+require('../../support/test-helper');
 
 var assert = require('assert');
-var cartodbServer = require('../../../../lib/server');
-var serverOptions = require('../../../../lib/server-options');
+var cartodbServer = require('../../../lib/server');
+var serverOptions = require('../../../lib/server-options');
 
 
 describe('windshaft', function() {
diff --git a/test/unit/cartodb/prepare-context-test.js b/test/unit/prepare-context-test.js
similarity index 93%
rename from test/unit/cartodb/prepare-context-test.js
rename to test/unit/prepare-context-test.js
index 7c91332e..b8675f99 100644
--- a/test/unit/cartodb/prepare-context-test.js
+++ b/test/unit/prepare-context-test.js
@@ -5,14 +5,14 @@ var _ = require('underscore');
 
 var RedisPool = require('redis-mpool');
 var cartodbRedis = require('cartodb-redis');
-var PgConnection = require('../../../lib/backends/pg-connection');
-var AuthBackend = require('../../../lib/backends/auth');
-var TemplateMaps = require('../../../lib/backends/template-maps');
+var PgConnection = require('../../lib/backends/pg-connection');
+var AuthBackend = require('../../lib/backends/auth');
+var TemplateMaps = require('../../lib/backends/template-maps');
 
-const cleanUpQueryParamsMiddleware = require('../../../lib/api/middlewares/clean-up-query-params');
-const authorizeMiddleware = require('../../../lib/api/middlewares/authorize');
-const dbConnSetupMiddleware = require('../../../lib/api/middlewares/db-conn-setup');
-const credentialsMiddleware = require('../../../lib/api/middlewares/credentials');
+const cleanUpQueryParamsMiddleware = require('../../lib/api/middlewares/clean-up-query-params');
+const authorizeMiddleware = require('../../lib/api/middlewares/authorize');
+const dbConnSetupMiddleware = require('../../lib/api/middlewares/db-conn-setup');
+const credentialsMiddleware = require('../../lib/api/middlewares/credentials');
 
 var windshaft = require('windshaft');
 
diff --git a/test/unit/cartodb/stats/reporter/named-map-provider-test.js b/test/unit/stats/reporter/named-map-provider-test.js
similarity index 94%
rename from test/unit/cartodb/stats/reporter/named-map-provider-test.js
rename to test/unit/stats/reporter/named-map-provider-test.js
index eefa9816..48712be4 100644
--- a/test/unit/cartodb/stats/reporter/named-map-provider-test.js
+++ b/test/unit/stats/reporter/named-map-provider-test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const assert = require('assert');
-const NamedMapProviderReporter = require('../../../../../lib/stats/reporter/named-map-provider');
+const NamedMapProviderReporter = require('../../../../lib/stats/reporter/named-map-provider');
 
 describe('named-map-provider-reporter', function () {
     it('should report metrics every 100 ms', function (done) {
diff --git a/test/unit/cartodb/substitution-tokens-test.js b/test/unit/substitution-tokens-test.js
similarity index 95%
rename from test/unit/cartodb/substitution-tokens-test.js
rename to test/unit/substitution-tokens-test.js
index f092e22e..7a9e5cda 100644
--- a/test/unit/cartodb/substitution-tokens-test.js
+++ b/test/unit/substitution-tokens-test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var assert = require('assert');
-var SubstitutionTokens = require('../../../lib/utils/substitution-tokens');
+var SubstitutionTokens = require('../../lib/utils/substitution-tokens');
 
 describe('SubstitutionTokens', function() {
 
diff --git a/test/unit/cartodb/table-name-parser-test.js b/test/unit/table-name-parser-test.js
similarity index 95%
rename from test/unit/cartodb/table-name-parser-test.js
rename to test/unit/table-name-parser-test.js
index fb279bf8..e5cb73fa 100644
--- a/test/unit/cartodb/table-name-parser-test.js
+++ b/test/unit/table-name-parser-test.js
@@ -1,9 +1,9 @@
 'use strict';
 
-require('../../support/test-helper');
+require('../support/test-helper');
 
 var assert        = require('assert');
-var TableNameParser     = require('../../../lib/utils/table-name-parser');
+var TableNameParser     = require('../../lib/utils/table-name-parser');
 
 describe('TableNameParser', function() {
 
diff --git a/test/unit/cartodb/template-maps-auth-test.js b/test/unit/template-maps-auth-test.js
similarity index 96%
rename from test/unit/cartodb/template-maps-auth-test.js
rename to test/unit/template-maps-auth-test.js
index df073324..4b7ff943 100644
--- a/test/unit/cartodb/template-maps-auth-test.js
+++ b/test/unit/template-maps-auth-test.js
@@ -1,11 +1,11 @@
 'use strict';
 
-require('../../support/test-helper');
+require('../support/test-helper');
 
 var assert = require('assert');
 var RedisPool = require('redis-mpool');
 
-var TemplateMaps = require('../../../lib/backends/template-maps');
+var TemplateMaps = require('../../lib/backends/template-maps');
 
 describe('template_maps_auth', function() {
 
diff --git a/test/unit/cartodb/template-maps-defaults-test.js b/test/unit/template-maps-defaults-test.js
similarity index 96%
rename from test/unit/cartodb/template-maps-defaults-test.js
rename to test/unit/template-maps-defaults-test.js
index fe0d35c0..3c98e77d 100644
--- a/test/unit/cartodb/template-maps-defaults-test.js
+++ b/test/unit/template-maps-defaults-test.js
@@ -1,10 +1,10 @@
 'use strict';
 
-require('../../support/test-helper');
+require('../support/test-helper');
 
 var assert = require('assert');
 var RedisPool = require('redis-mpool');
-var TemplateMaps = require('../../../lib/backends/template-maps');
+var TemplateMaps = require('../../lib/backends/template-maps');
 var _ = require('underscore');
 
 describe('template_maps', function() {
diff --git a/test/unit/cartodb/template-maps-test.js b/test/unit/template-maps-test.js
similarity index 99%
rename from test/unit/cartodb/template-maps-test.js
rename to test/unit/template-maps-test.js
index e8124be9..f4aa376b 100644
--- a/test/unit/cartodb/template-maps-test.js
+++ b/test/unit/template-maps-test.js
@@ -1,10 +1,10 @@
 'use strict';
 
-var testHelper = require('../../support/test-helper');
+var testHelper = require('../support/test-helper');
 
 var assert = require('assert');
 var RedisPool = require('redis-mpool');
-var TemplateMaps = require('../../../lib/backends/template-maps');
+var TemplateMaps = require('../../lib/backends/template-maps');
 var step = require('step');
 var _ = require('underscore');
 
diff --git a/test/unit/cartodb/utils/date-wrapper-test.js b/test/unit/utils/date-wrapper-test.js
similarity index 87%
rename from test/unit/cartodb/utils/date-wrapper-test.js
rename to test/unit/utils/date-wrapper-test.js
index 3cb05743..a76d0792 100644
--- a/test/unit/cartodb/utils/date-wrapper-test.js
+++ b/test/unit/utils/date-wrapper-test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var assert = require('assert');
-var dateWrapper = require('../../../../lib/utils/date-wrapper');
+var dateWrapper = require('../../../lib/utils/date-wrapper');
 
 describe('date-wrapper', function() {
 
diff --git a/test/unit/cartodb/valid-template-maps-test.js b/test/unit/valid-template-maps-test.js
similarity index 96%
rename from test/unit/cartodb/valid-template-maps-test.js
rename to test/unit/valid-template-maps-test.js
index 8b84291e..e38d9488 100644
--- a/test/unit/cartodb/valid-template-maps-test.js
+++ b/test/unit/valid-template-maps-test.js
@@ -1,10 +1,10 @@
 'use strict';
 
-require('../../support/test-helper');
+require('../support/test-helper');
 
 var assert = require('assert');
 var RedisPool = require('redis-mpool');
-var TemplateMaps = require('../../../lib/backends/template-maps');
+var TemplateMaps = require('../../lib/backends/template-maps');
 var _ = require('underscore');
 
 describe('template_maps', function() {