1 files changed, 2 insertions, 6 deletions
diff --git a/spec/models/project_feature_usage_spec.rb b/spec/models/project_feature_usage_spec.rb
index 6ef407432b0..698c5374e88 100644
--- a/spec/models/project_feature_usage_spec.rb
+++ b/spec/models/project_feature_usage_spec.rb
@@ -128,19 +128,15 @@ RSpec.describe ProjectFeatureUsage, type: :model do
   end
 
   context 'ProjectFeatureUsage with DB Load Balancing', :request_store do
-    include_context 'clear DB Load Balancing configuration'
-
     describe '#log_jira_dvcs_integration_usage' do
       let!(:project) { create(:project) }
 
       subject { project.feature_usage }
 
-      context 'database load balancing is configured' do
+      context 'database load balancing is configured', :db_load_balancing do
         before do
-          # Do not pollute AR for other tests, but rather simulate effect of configure_proxy.
-          allow(ActiveRecord::Base.singleton_class).to receive(:prepend)
-          ::Gitlab::Database::LoadBalancing.configure_proxy
           allow(ActiveRecord::Base).to receive(:connection).and_return(::Gitlab::Database::LoadBalancing.proxy)
+
           ::Gitlab::Database::LoadBalancing::Session.clear_session
         end