diff --git a/config/initializers/04-message_bus.rb b/config/initializers/04-message_bus.rb
index 00bf806d410..ec0a7f974ec 100644
--- a/config/initializers/04-message_bus.rb
+++ b/config/initializers/04-message_bus.rb
@@ -51,7 +51,7 @@ end
 MessageBus.cache_assets = !Rails.env.development?
 MessageBus.enable_diagnostics
 
-if Rails.env == "test"
+if Rails.env == "test" || $0 =~ /rake$/
   # disable keepalive in testing
   MessageBus.keepalive_interval = -1
 end