diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index ab44d904ea9..59a0cb954af 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -106,7 +106,6 @@ module TestSetup
     #
     # Discourse.redis = DiscourseMockRedis.new
 
-    RateLimiter.disable
     PostActionNotifier.disable
     SearchIndexer.disable
     UserActionManager.disable
@@ -260,6 +259,8 @@ RSpec.configure do |config|
 
     unfreeze_time
     ActionMailer::Base.deliveries.clear
+    RateLimiter.disable
+    RateLimiter.clear_all!
 
     if ActiveRecord::Base.connection_pool.stat[:busy] > 1
       raise ActiveRecord::Base.connection_pool.stat.inspect