diff --git a/config/initializers/01-redis.rb b/config/initializers/01-redis.rb
index eaff97f45..2a359fd6f 100644
--- a/config/initializers/01-redis.rb
+++ b/config/initializers/01-redis.rb
@@ -2,7 +2,7 @@ require "#{Rails.root}/lib/discourse_redis"
 
 $redis = DiscourseRedis.new
 
-if Rails.env.development? && !ENV['DO_NOT_FLUSH_REDIS']
+if Rails.env.development? && ENV['DISCOURSE_FLUSH_REDIS']
   puts "Flushing redis (development mode)"
   $redis.flushall
 end
diff --git a/vendor/gems/message_bus/spec/lib/multi_process_spec.rb b/vendor/gems/message_bus/spec/lib/multi_process_spec.rb
index db6a5fde2..91d7e0b98 100644
--- a/vendor/gems/message_bus/spec/lib/multi_process_spec.rb
+++ b/vendor/gems/message_bus/spec/lib/multi_process_spec.rb
@@ -30,7 +30,7 @@ describe MessageBus::ReliablePubSub do
 
   it 'gets every response from child processes' do
     pid = nil
-    Redis.new(:db => 10).flushall
+    Redis.new(:db => 10).flushdb
     begin
       pids = (1..10).map{spawn_child}
       responses = []