diff --git a/test/acceptance/server.js b/test/acceptance/server.js
index 7d256fbd..f99442a6 100644
--- a/test/acceptance/server.js
+++ b/test/acceptance/server.js
@@ -1,15 +1,12 @@
+require(__dirname + '/../support/test_helper');
+
 var assert      = require('../support/assert');
 var _           = require('underscore');
-var redis       = require('redis');
 var querystring = require('querystring');
 var step        = require('step');
 
-var helper = require(__dirname + '/../support/test_helper');
-
-var IMAGE_EQUALS_TOLERANCE_PER_MIL = 20;
-
-var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/cartodb_windshaft');
-var serverOptions = require(__dirname + '/../../lib/cartodb/server_options')();
+var CartodbWindshaft = require('../../lib/cartodb/cartodb_windshaft');
+var serverOptions = require('../../lib/cartodb/server_options')();
 var server = new CartodbWindshaft(serverOptions);
 server.setMaxListeners(0);
 
@@ -66,8 +63,6 @@ suite('server', function() {
 
 suite.skip('server old_api', function() {
 
-    var redis_client = redis.createClient(global.environment.redis.port);
-
     var test_database = _.template(global.environment.postgres_auth_user, {user_id:1}) + '_db';
 
     test("uses sqlapi to figure source data of query", function(done){
@@ -156,20 +151,4 @@ suite.skip('server old_api', function() {
         });
     });
 
-    /////////////////////////////////////////////////////////////////////////////////
-    //
-    // Tear down
-    //
-    /////////////////////////////////////////////////////////////////////////////////
-
-    suiteTeardown(function(done) {
-        // This test will add map_style records, like
-        // 'map_style|null|publicuser|my_table',
-        redis_client.keys("map_style|*", function(err, matches) {
-            redis_client.del(matches, function() {
-                done();
-            });
-        });
-    });
-    
 });
diff --git a/test/support/prepare_db.sh b/test/support/prepare_db.sh
index dba10043..8185da4d 100755
--- a/test/support/prepare_db.sh
+++ b/test/support/prepare_db.sh
@@ -79,8 +79,8 @@ if test x"$PREPARE_PGSQL" = xyes; then
     psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1
 
   psql -c "CREATE EXTENSION plpythonu;" ${TEST_DB}
-#  curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryStatements.sql -o sql/CDB_QueryStatements.sql
-#  curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryTables.sql -o sql/CDB_QueryTables.sql
+  curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryStatements.sql -o sql/CDB_QueryStatements.sql
+  curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryTables.sql -o sql/CDB_QueryTables.sql
   cat sql/CDB_QueryStatements.sql sql/CDB_QueryTables.sql |
     psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1