diff --git a/test/acceptance/batch/job.query.order.test.js b/test/acceptance/batch/job.query.order.test.js
index a56d6e50..c51f050d 100644
--- a/test/acceptance/batch/job.query.order.test.js
+++ b/test/acceptance/batch/job.query.order.test.js
@@ -1,7 +1,7 @@
 require('../../helper');
 var assert = require('../../support/assert');
 
-var BatchTestClient = require('./batch-test-client');
+var BatchTestClient = require('../../support/batch-test-client');
 var JobStatus = require('../../../batch/job_status');
 
 describe('job query order', function() {
diff --git a/test/acceptance/batch/job.query.timeout.test.js b/test/acceptance/batch/job.query.timeout.test.js
index 853adf4d..65df00d2 100644
--- a/test/acceptance/batch/job.query.timeout.test.js
+++ b/test/acceptance/batch/job.query.timeout.test.js
@@ -1,7 +1,7 @@
 require('../../helper');
 var assert = require('../../support/assert');
 
-var BatchTestClient = require('./batch-test-client');
+var BatchTestClient = require('../../support/batch-test-client');
 var JobStatus = require('../../../batch/job_status');
 
 describe('job query timeout', function() {
diff --git a/test/acceptance/batch/batch-test-client.js b/test/support/batch-test-client.js
similarity index 93%
rename from test/acceptance/batch/batch-test-client.js
rename to test/support/batch-test-client.js
index 0494038b..1abf213f 100644
--- a/test/acceptance/batch/batch-test-client.js
+++ b/test/support/batch-test-client.js
@@ -1,14 +1,14 @@
 'use strict';
 
-require('../../helper');
-var assert = require('../../support/assert');
-var appServer = require('../../../app/server');
-var redisUtils = require('../../support/redis_utils');
+require('../helper');
+var assert = require('assert');
+var appServer = require('../../app/server');
+var redisUtils = require('./redis_utils');
 var debug = require('debug')('batch-test-client');
 
-var JobStatus = require('../../../batch/job_status');
+var JobStatus = require('../../batch/job_status');
 var metadataBackend = require('cartodb-redis')(redisUtils.getConfig());
-var batchFactory = require('../../../batch/index');
+var batchFactory = require('../../batch/index');
 
 function response(code) {
     return {