diff --git a/test/acceptance/rate-limit.test.js b/test/acceptance/rate-limit.test.js
index 0a7438a8..d14f39df 100644
--- a/test/acceptance/rate-limit.test.js
+++ b/test/acceptance/rate-limit.test.js
@@ -81,10 +81,18 @@ function setLimit(count, period, burst) {
 
 describe('rate limit acceptance', function() {
     before(function() {
+        global.environment.enabledFeatures.rateLimitsEnabled = true;
+        global.environment.enabledFeatures.rateLimitsByEndpoint.endpoint1 = true;
+        
         redisClient = redis.createClient(global.environment.redis.port);
         testClient = new TestClient(createMapConfig(), 1234);
     });
 
+    after(function() {
+        global.environment.enabledFeatures.rateLimitsEnabled = false;
+        global.environment.enabledFeatures.rateLimitsByEndpoint.endpoint1 = false;
+    });
+
     afterEach(function(done) {
         keysToDelete.forEach( key => {
             redisClient.del(key);
diff --git a/test/unit/cartodb/rate-limit.test.js b/test/unit/cartodb/rate-limit.test.js
index c8cca68b..4b3ccb35 100644
--- a/test/unit/cartodb/rate-limit.test.js
+++ b/test/unit/cartodb/rate-limit.test.js
@@ -40,6 +40,9 @@ function getReqAndRes() {
 
 describe('rate limit unit', function() {
     before(function() {
+        global.environment.enabledFeatures.rateLimitsEnabled = true;
+        global.environment.enabledFeatures.rateLimitsByEndpoint.endpoint8 = true;
+        
         const redisPool = new RedisPool(global.environment.redis);
         const metadataBackend = cartodbRedis({pool: redisPool});
         rateLimit = rateLimitMiddleware(metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_8);
@@ -48,6 +51,9 @@ describe('rate limit unit', function() {
     });
 
     after(function() {
+        global.environment.enabledFeatures.rateLimitsEnabled = false;
+        global.environment.enabledFeatures.rateLimitsByEndpoint.endpoint8 = false;
+        
         keysToDelete.forEach( key => {
             redisClient.del(key);
         });