diff --git a/test/acceptance/cache/surrogate-keys-invalidation.js b/test/acceptance/cache/surrogate-keys-invalidation.js
index 58336275..f884b07c 100644
--- a/test/acceptance/cache/surrogate-keys-invalidation.js
+++ b/test/acceptance/cache/surrogate-keys-invalidation.js
@@ -7,7 +7,7 @@ var step        = require('step');
 var FastlyPurge = require('fastly-purge');
 var _ = require('underscore');
 var NamedMapsCacheEntry = require('../../../lib/cache/model/named-maps-entry');
-var CartodbWindshaft = require(__dirname + '/../../../lib/server');
+var CartodbWindshaft = require('../../../lib/server');
 var nock = require('nock');
 
 describe('templates surrogate keys', function() {
diff --git a/test/acceptance/dynamic-styling-named-maps.js b/test/acceptance/dynamic-styling-named-maps.js
index a00c4106..988b2a0e 100644
--- a/test/acceptance/dynamic-styling-named-maps.js
+++ b/test/acceptance/dynamic-styling-named-maps.js
@@ -3,9 +3,9 @@
 var assert = require('../support/assert');
 var step = require('step');
 var LayergroupToken = require('../../lib/models/layergroup-token');
-var testHelper = require(__dirname + '/../support/test-helper');
-var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server-options');
+var testHelper = require('../support/test-helper');
+var CartodbWindshaft = require('../../lib/server');
+var serverOptions = require('../../lib/server-options');
 
 describe('dynamic styling for named maps', function() {
     var server;
diff --git a/test/acceptance/errors-with-context.js b/test/acceptance/errors-with-context.js
index 25c83101..4d58b57a 100644
--- a/test/acceptance/errors-with-context.js
+++ b/test/acceptance/errors-with-context.js
@@ -1,8 +1,8 @@
 'use strict';
 
 var assert = require('../support/assert');
-var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server-options');
+var CartodbWindshaft = require('../../lib/server');
+var serverOptions = require('../../lib/server-options');
 
 describe('error with context', function () {
     var server;
diff --git a/test/acceptance/health-check.js b/test/acceptance/health-check.js
index 9bd8e502..cff4b41e 100644
--- a/test/acceptance/health-check.js
+++ b/test/acceptance/health-check.js
@@ -1,6 +1,6 @@
 'use strict';
 
-require(__dirname + '/../support/test-helper');
+require('../support/test-helper');
 
 var fs = require('fs');
 
diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js
index 18a30f55..10fb4451 100644
--- a/test/acceptance/multilayer.js
+++ b/test/acceptance/multilayer.js
@@ -10,7 +10,7 @@ var redis_stats_db = 5;
 var mapnik = require('windshaft').mapnik;
 var semver = require('semver');
 
-var helper = require(__dirname + '/../support/test-helper');
+var helper = require('../support/test-helper');
 var LayergroupToken = require('../../lib/models/layergroup-token');
 
 var windshaft_fixtures = __dirname + '/../../node_modules/windshaft/test/fixtures';
diff --git a/test/acceptance/named-layers-visibility.js b/test/acceptance/named-layers-visibility.js
index cdf08aaf..a68314fe 100644
--- a/test/acceptance/named-layers-visibility.js
+++ b/test/acceptance/named-layers-visibility.js
@@ -4,8 +4,8 @@ var step = require('step');
 var test_helper = require('../support/test-helper');
 
 var assert = require('../support/assert');
-var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server-options');
+var CartodbWindshaft = require('../../lib/server');
+var serverOptions = require('../../lib/server-options');
 
 var RedisPool = require('redis-mpool');
 var TemplateMaps = require('../../lib/backends/template-maps');
diff --git a/test/acceptance/named-layers.js b/test/acceptance/named-layers.js
index 79c33f83..a7da4e86 100644
--- a/test/acceptance/named-layers.js
+++ b/test/acceptance/named-layers.js
@@ -3,8 +3,8 @@
 var test_helper = require('../support/test-helper');
 
 var assert = require('../support/assert');
-var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server-options');
+var CartodbWindshaft = require('../../lib/server');
+var serverOptions = require('../../lib/server-options');
 
 var LayergroupToken = require('../../lib/models/layergroup-token');
 
diff --git a/test/acceptance/named-maps-authentication.js b/test/acceptance/named-maps-authentication.js
index 4648458b..ac898c5e 100644
--- a/test/acceptance/named-maps-authentication.js
+++ b/test/acceptance/named-maps-authentication.js
@@ -6,8 +6,8 @@ var querystring = require('querystring');
 
 var assert = require('../support/assert');
 var mapnik = require('windshaft').mapnik;
-var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server-options');
+var CartodbWindshaft = require('../../lib/server');
+var serverOptions = require('../../lib/server-options');
 var TemplateMaps = require('../../lib/backends/template-maps');
 var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry');
 
diff --git a/test/acceptance/named-maps-stats.js b/test/acceptance/named-maps-stats.js
index fc596bcb..a41644ba 100644
--- a/test/acceptance/named-maps-stats.js
+++ b/test/acceptance/named-maps-stats.js
@@ -6,8 +6,8 @@ var querystring = require('querystring');
 
 var assert = require('../support/assert');
 var mapnik = require('windshaft').mapnik;
-var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server-options');
+var CartodbWindshaft = require('../../lib/server');
+var serverOptions = require('../../lib/server-options');
 var TemplateMaps = require('../../lib/backends/template-maps');
 var NamedMapsCacheEntry = require('../../lib/cache/model/named-maps-entry');
 
diff --git a/test/acceptance/overviews-metadata-named-maps.js b/test/acceptance/overviews-metadata-named-maps.js
index 2ef51358..5dc11240 100644
--- a/test/acceptance/overviews-metadata-named-maps.js
+++ b/test/acceptance/overviews-metadata-named-maps.js
@@ -3,8 +3,8 @@
 var test_helper = require('../support/test-helper');
 
 var assert = require('../support/assert');
-var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server-options');
+var CartodbWindshaft = require('../../lib/server');
+var serverOptions = require('../../lib/server-options');
 
 var LayergroupToken = require('../../lib/models/layergroup-token');
 
diff --git a/test/acceptance/overviews-metadata.js b/test/acceptance/overviews-metadata.js
index 2d6d828a..92ab562a 100644
--- a/test/acceptance/overviews-metadata.js
+++ b/test/acceptance/overviews-metadata.js
@@ -3,8 +3,8 @@
 var test_helper = require('../support/test-helper');
 
 var assert = require('../support/assert');
-var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server-options');
+var CartodbWindshaft = require('../../lib/server');
+var serverOptions = require('../../lib/server-options');
 
 var LayergroupToken = require('../../lib/models/layergroup-token');
 
diff --git a/test/acceptance/regressions.js b/test/acceptance/regressions.js
index 35227e24..8ac63a83 100644
--- a/test/acceptance/regressions.js
+++ b/test/acceptance/regressions.js
@@ -5,8 +5,8 @@ var assert = require('../support/assert');
 const helper = require('../support/test-helper');
 var TestClient = require('../support/test-client');
 const LayergroupToken = require('../../lib/models/layergroup-token');
-const CartodbWindshaft = require(__dirname + '/../../lib/server');
-const serverOptions = require(__dirname + '/../../lib/server-options');
+const CartodbWindshaft = require('../../lib/server');
+const serverOptions = require('../../lib/server-options');
 
 describe('regressions', function() {
 
diff --git a/test/acceptance/templates.js b/test/acceptance/templates.js
index da25c771..b9c36b63 100644
--- a/test/acceptance/templates.js
+++ b/test/acceptance/templates.js
@@ -18,10 +18,10 @@ process.env.PGHOST = 'fake';
 var fs = require('fs');
 var http = require('http');
 
-var helper = require(__dirname + '/../support/test-helper');
+var helper = require('../support/test-helper');
 
-var CartodbWindshaft = require(__dirname + '/../../lib/server');
-var serverOptions = require(__dirname + '/../../lib/server-options');
+var CartodbWindshaft = require('../../lib/server');
+var serverOptions = require('../../lib/server-options');
 
 var LayergroupToken = require('../../lib/models/layergroup-token');
 
diff --git a/test/support/test-helper.js b/test/support/test-helper.js
index 6890a79d..1ae8d77d 100644
--- a/test/support/test-helper.js
+++ b/test/support/test-helper.js
@@ -18,7 +18,7 @@ var log4js = require('log4js');
 const setICUEnvVariable = require('../../lib/utils/icu-data-env-setter');
 
 // set environment specific variables
-global.environment  = require(__dirname + '/../../config/environments/test');
+global.environment  = require('../../config/environments/test');
 global.environment.name = 'test';
 process.env.NODE_ENV = 'test';