4 files changed, 9 insertions, 20 deletions

diff --git a/spec/services/design_management/copy_design_collection/queue_service_spec.rb b/spec/services/design_management/copy_design_collection/queue_service_spec.rb
index 2d9ea4633a0..05a7b092ccf 100644
--- a/spec/services/design_management/copy_design_collection/queue_service_spec.rb
+++ b/spec/services/design_management/copy_design_collection/queue_service_spec.rb
@@ -39,7 +39,7 @@ RSpec.describe DesignManagement::CopyDesignCollection::QueueService, :clean_gitl
       expect { subject }.to change { target_issue.design_collection.copy_state }.from('ready').to('in_progress')
     end
 
-    it 'queues a DesignManagement::CopyDesignCollectionWorker' do
+    it 'queues a DesignManagement::CopyDesignCollectionWorker', :clean_gitlab_redis_queues do
       expect { subject }.to change(DesignManagement::CopyDesignCollectionWorker.jobs, :size).by(1)
     end
 
diff --git a/spec/services/event_create_service_spec.rb b/spec/services/event_create_service_spec.rb
index 6c356f685ec..611e821f3e5 100644
--- a/spec/services/event_create_service_spec.rb
+++ b/spec/services/event_create_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe EventCreateService do
+RSpec.describe EventCreateService, :clean_gitlab_redis_cache, :clean_gitlab_redis_shared_state do
   let(:service) { described_class.new }
 
   let_it_be(:user, reload: true) { create :user }
@@ -50,7 +50,7 @@ RSpec.describe EventCreateService do
     end
   end
 
-  describe 'Merge Requests', :clean_gitlab_redis_shared_state do
+  describe 'Merge Requests' do
     describe '#open_mr' do
       subject(:open_mr) { service.open_mr(merge_request, merge_request.author) }
 
@@ -194,7 +194,7 @@ RSpec.describe EventCreateService do
     end
   end
 
-  describe '#wiki_event', :clean_gitlab_redis_shared_state do
+  describe '#wiki_event' do
     let_it_be(:user) { create(:user) }
     let_it_be(:wiki_page) { create(:wiki_page) }
     let_it_be(:meta) { create(:wiki_page_meta, :for_wiki_page, wiki_page: wiki_page) }
@@ -247,7 +247,7 @@ RSpec.describe EventCreateService do
     end
   end
 
-  describe '#push', :clean_gitlab_redis_shared_state do
+  describe '#push' do
     let(:push_data) do
       {
         commits: [
@@ -272,7 +272,7 @@ RSpec.describe EventCreateService do
     end
   end
 
-  describe '#bulk_push', :clean_gitlab_redis_shared_state do
+  describe '#bulk_push' do
     let(:push_data) do
       {
         action: :created,
@@ -306,7 +306,7 @@ RSpec.describe EventCreateService do
     end
   end
 
-  describe 'design events', :clean_gitlab_redis_shared_state do
+  describe 'design events' do
     let_it_be(:design) { create(:design, project: project) }
     let_it_be(:author) { user }
 
diff --git a/spec/services/git/branch_push_service_spec.rb b/spec/services/git/branch_push_service_spec.rb
index 53f5dd8b647..fc629fe583d 100644
--- a/spec/services/git/branch_push_service_spec.rb
+++ b/spec/services/git/branch_push_service_spec.rb
@@ -554,24 +554,13 @@ RSpec.describe Git::BranchPushService, services: true do
     end
   end
 
-  describe "housekeeping" do
+  describe "housekeeping", :clean_gitlab_redis_cache, :clean_gitlab_redis_queues, :clean_gitlab_redis_shared_state do
     let(:housekeeping) { Repositories::HousekeepingService.new(project) }
 
     before do
-      # Flush any raw key-value data stored by the housekeeping code.
-      Gitlab::Redis::Cache.with { |conn| conn.flushall }
-      Gitlab::Redis::Queues.with { |conn| conn.flushall }
-      Gitlab::Redis::SharedState.with { |conn| conn.flushall }
-
       allow(Repositories::HousekeepingService).to receive(:new).and_return(housekeeping)
     end
 
-    after do
-      Gitlab::Redis::Cache.with { |conn| conn.flushall }
-      Gitlab::Redis::Queues.with { |conn| conn.flushall }
-      Gitlab::Redis::SharedState.with { |conn| conn.flushall }
-    end
-
     it 'does not perform housekeeping when not needed' do
       expect(housekeeping).not_to receive(:execute)
 
diff --git a/spec/services/members/create_service_spec.rb b/spec/services/members/create_service_spec.rb
index 62bccde1963..ee5250b5b3d 100644
--- a/spec/services/members/create_service_spec.rb
+++ b/spec/services/members/create_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_shared_state, :sidekiq_inline do
+RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_cache, :clean_gitlab_redis_shared_state, :sidekiq_inline do
   let_it_be(:source) { create(:project) }
   let_it_be(:user) { create(:user) }
   let_it_be(:member) { create(:user) }