diff --git a/test/acceptance/server.js b/test/acceptance/server.js
index 47cdd737..c6874f3b 100644
--- a/test/acceptance/server.js
+++ b/test/acceptance/server.js
@@ -998,8 +998,7 @@ suite('server', function() {
           });
         },
         function finish(err) {
-          if ( err ) done(err);
-          else done();
+          done(err);
         }
       );
     });
@@ -1014,24 +1013,30 @@ suite('server', function() {
         var sqlapi;
         Step(
           function sendRequest(err) {
+            var next = this;
             assert.response(server, {
                 headers: {host: 'localhost'},
                 url: '/tiles/gadm4/6/31/24.png?' + querystring.stringify(qo),
                 method: 'GET'
-            },{}, this);
+            },{}, function(res) { next(null, res); });
           },
-          function checkResponse(res) {
+          function checkResponse(err, res) {
+            if ( err ) throw err;
             assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body);
             var ct = res.headers['content-type'];
             assert.equal(ct, 'image/png');
             var cc = res.headers['x-cache-channel'];
+            assert(cc);
             var dbname = 'test_cartodb_user_1_db'
             assert.equal(cc.substring(0, dbname.length), dbname);
             var jsonquery = cc.substring(dbname.length+1);
             var sentquery = JSON.parse(jsonquery);
             assert.equal(sentquery.api_key, qo.map_key);
             assert.equal(sentquery.q, 'SELECT CDB_QueryTables($windshaft$' + qo.sql + '$windshaft$)');
-            done();
+            return null;
+          },
+          function finish(err) {
+            done(err);
           }
         );
     });
@@ -1047,19 +1052,24 @@ suite('server', function() {
         var sqlapi;
         Step(
           function sendRequest(err) {
+            var next = this;
             assert.response(server, {
                 headers: {host: 'localhost'},
                 url: '/tiles/gadm4/6/31/24.png?' + querystring.stringify(qo),
                 method: 'GET'
-            },{}, this);
+            },{}, function(res) { next(null, res); });
           },
-          function checkResponse(res) {
+          function checkResponse(err, res) {
+            if ( err ) throw err;
             assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body);
             var ct = res.headers['content-type'];
             assert.equal(ct, 'image/png');
             // does NOT send an x-cache-channel
             assert.ok(!res.headers.hasOwnProperty('x-cache-channel'));
-            done();
+            return null;
+          },
+          function finish(err) {
+            done(err);
           }
         );
     });
diff --git a/test/support/prepare_db.sh b/test/support/prepare_db.sh
index 0468ceca..a9b1149c 100755
--- a/test/support/prepare_db.sh
+++ b/test/support/prepare_db.sh
@@ -40,8 +40,6 @@ if test -z "$TESTPASS"; then
 fi
 TESTPASS=`echo ${TESTPASS} | sed "s/<%= user_id %>/${TESTUSERID}/"`
 
-#TESTUSER="cartodb_test_user_1" # TODO: extract from psotgres_auth_user
-#TESTPASS="cartodb_test_user_1_pass" # TODO: extract from postgres_auth_pass
 TEST_DB="${TESTUSER}_db"
 
 if test -z "$REDIS_PORT"; then REDIS_PORT=6333; fi
@@ -54,6 +52,8 @@ PUBLICUSER=`node -e "console.log(require('${TESTENV}').postgres.user || 'xxx')"`
 PUBLICPASS=`node -e "console.log(require('${TESTENV}').postgres.password || 'xxx')"`
 echo "PUBLICUSER: ${PUBLICUSER}"
 echo "PUBLICPASS: ${PUBLICPASS}"
+echo "TESTUSER: ${TESTUSER}"
+echo "TESTPASS: ${TESTPASS}"
 
 cat sql/windshaft.test.sql sql/gadm4.sql |
   sed "s/:PUBLICUSER/${PUBLICUSER}/" |