diff --git a/test/acceptance/server.js b/test/acceptance/server.js
index c896d2a9..6ad061ed 100644
--- a/test/acceptance/server.js
+++ b/test/acceptance/server.js
@@ -1,6 +1,7 @@
 var assert      = require('../support/assert');
 var tests       = module.exports = {};
 var _           = require('underscore');
+var redis       = require('redis');
 var querystring = require('querystring');
 require(__dirname + '/../support/test_helper');
 
@@ -11,6 +12,11 @@ server.setMaxListeners(0);
 
 suite('server', function() {
 
+    var redis_client = redis.createClient(global.environment.redis.port);
+    
+    suiteSetup(function(){
+    });
+
     /////////////////////////////////////////////////////////////////////////////////
     //
     // GET UNSUPPORTED
@@ -533,5 +539,14 @@ suite('server', function() {
         });
     });
 
+    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) {
+            _.each(matches, function(k) { redis_client.del(k); });
+            done();
+        });
+    });
+    
 });