diff --git a/test/acceptance/ported/regressions.js b/test/acceptance/ported/regressions.js
index b23d879f..5ba5b3e4 100644
--- a/test/acceptance/ported/regressions.js
+++ b/test/acceptance/ported/regressions.js
@@ -59,10 +59,6 @@ describe('regressions', function() {
         res_serv.close(done);
     });
 
-    afterEach(function(done) {
-        testHelper.deleteRedisKeys({'user:localhost:mapviews:global': 5}, done);
-    });
-
     // See https://github.com/Vizzuality/Windshaft/issues/65
     it("#65 catching non-Error exception doesn't kill the backend", function(done) {
         var mapConfig = testClient.defaultTableMapConfig('test_table');
diff --git a/test/acceptance/ported/support/test_client.js b/test/acceptance/ported/support/test_client.js
index 5f924b63..70ca644a 100644
--- a/test/acceptance/ported/support/test_client.js
+++ b/test/acceptance/ported/support/test_client.js
@@ -476,10 +476,12 @@ function withLayergroup(layergroupConfig, options, callback) {
             }
 
             function finish(done) {
-                var redisKey = 'map_cfg|' + layergroupid.split(':')[0];
-                redisClient.del(redisKey, function (delErr) {
-                    return done(delErr);
-                });
+                var keysToDelete = {
+                    'user:localhost:mapviews:global': 5
+                };
+                var redisKey = 'map_cfg|' + LayergroupToken.parse(layergroupid).token;
+                keysToDelete[redisKey] = 0;
+                testHelper.deleteRedisKeys(keysToDelete, done);
             }
 
             return callback(err, requestTile, finish);