diff --git a/spec/lib/gitlab/ci/config/feature_flags_spec.rb b/spec/lib/gitlab/ci/config/feature_flags_spec.rb
index 21b49931f177183df867452acbfa01465b823cb4..fec2e76d2766edda25b8d1e2f26818b1b4776ee9 100644
--- a/spec/lib/gitlab/ci/config/feature_flags_spec.rb
+++ b/spec/lib/gitlab/ci/config/feature_flags_spec.rb
@@ -48,7 +48,7 @@
   end
 
   context 'when feature flag is checked outside the "with_actor" block' do
-    context 'when ci_config_feature_flag_correctness is used', :ci_config_feature_flag_correctness do
+    context 'when ci_config_feature_flag_correctness is used' do
       it 'raises an error on dev/test environment' do
         expect { described_class.enabled?(feature_flag) }.to raise_error(described_class::NoActorError)
       end
@@ -68,16 +68,6 @@
         end
       end
     end
-
-    context 'when ci_config_feature_flag_correctness is not used' do
-      it 'checks the feature flag without actor' do
-        expect(Feature).to receive(:enabled?).with(feature_flag, nil)
-        expect(Gitlab::ErrorTracking)
-          .to receive(:track_exception)
-
-        described_class.enabled?(feature_flag)
-      end
-    end
   end
 
   context 'when actor is explicitly nil' do
diff --git a/spec/services/ci/create_pipeline_service/artifacts_spec.rb b/spec/services/ci/create_pipeline_service/artifacts_spec.rb
index fcf084a545459956e4821d40a60c62f351a09486..5b200cfa403f17347161655098ecbcf408a43d12 100644
--- a/spec/services/ci/create_pipeline_service/artifacts_spec.rb
+++ b/spec/services/ci/create_pipeline_service/artifacts_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness, feature_category: :job_artifacts do
+RSpec.describe Ci::CreatePipelineService, feature_category: :job_artifacts do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { project.first_owner }
 
diff --git a/spec/services/ci/create_pipeline_service/cache_spec.rb b/spec/services/ci/create_pipeline_service/cache_spec.rb
index cfaf440985e8bdd7f8b7f965d50a8707b9fe0e0e..d8c30508f8b79fe67c332786843d6eba21008ce5 100644
--- a/spec/services/ci/create_pipeline_service/cache_spec.rb
+++ b/spec/services/ci/create_pipeline_service/cache_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :continuous_integration do
   context 'cache' do
     let(:project)  { create(:project, :custom_repo, files: files) }
diff --git a/spec/services/ci/create_pipeline_service/creation_errors_and_warnings_spec.rb b/spec/services/ci/create_pipeline_service/creation_errors_and_warnings_spec.rb
index 06416a31aac1ffb9ea7f45f3a0229c67864e9aa5..854df09f4d1ef31d02c9d203941fe92c3e196088 100644
--- a/spec/services/ci/create_pipeline_service/creation_errors_and_warnings_spec.rb
+++ b/spec/services/ci/create_pipeline_service/creation_errors_and_warnings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness, feature_category: :continuous_integration do
+RSpec.describe Ci::CreatePipelineService, feature_category: :continuous_integration do
   describe 'creation errors and warnings' do
     let_it_be(:project) { create(:project, :repository) }
     let_it_be(:user)    { project.first_owner }
diff --git a/spec/services/ci/create_pipeline_service/cross_project_pipeline_spec.rb b/spec/services/ci/create_pipeline_service/cross_project_pipeline_spec.rb
index da402820e4d323d6bcf155a5171adc61b491d094..823a618ab79f8f4bbd99f18901c51c15ea157737 100644
--- a/spec/services/ci/create_pipeline_service/cross_project_pipeline_spec.rb
+++ b/spec/services/ci/create_pipeline_service/cross_project_pipeline_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, '#execute', :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService, '#execute',
   feature_category: :continuous_integration do
   let_it_be(:group) { create(:group) }
 
diff --git a/spec/services/ci/create_pipeline_service/custom_config_content_spec.rb b/spec/services/ci/create_pipeline_service/custom_config_content_spec.rb
index a748ebce92e483263631ab4cb3f9d0fd96a1066a..029c800887798a453171a2b17bc9978a577810fa 100644
--- a/spec/services/ci/create_pipeline_service/custom_config_content_spec.rb
+++ b/spec/services/ci/create_pipeline_service/custom_config_content_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness, feature_category: :continuous_integration do
+RSpec.describe Ci::CreatePipelineService, feature_category: :continuous_integration do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { project.first_owner }
 
diff --git a/spec/services/ci/create_pipeline_service/custom_yaml_tags_spec.rb b/spec/services/ci/create_pipeline_service/custom_yaml_tags_spec.rb
index f25c1a7cd8a6fe5ece0ca96b5cc3be17e38bad48..dc5b1b548cec249fd50c24e5a6058de7a8e95be1 100644
--- a/spec/services/ci/create_pipeline_service/custom_yaml_tags_spec.rb
+++ b/spec/services/ci/create_pipeline_service/custom_yaml_tags_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :continuous_integration do
   describe '!reference tags' do
     let_it_be(:project) { create(:project, :repository) }
diff --git a/spec/services/ci/create_pipeline_service/dry_run_spec.rb b/spec/services/ci/create_pipeline_service/dry_run_spec.rb
index 4e5b76343ab0c96200f4269a7961278c7d23628a..2c2ee563238f187e3d5df13f2a686626e1860bc5 100644
--- a/spec/services/ci/create_pipeline_service/dry_run_spec.rb
+++ b/spec/services/ci/create_pipeline_service/dry_run_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :continuous_integration do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { project.first_owner }
diff --git a/spec/services/ci/create_pipeline_service/environment_spec.rb b/spec/services/ci/create_pipeline_service/environment_spec.rb
index 6a2b61ea1911be9d22da5c96c1ae8bc4221e1f57..0df80b8a9de36d3994ee1e093314db95a082ef7f 100644
--- a/spec/services/ci/create_pipeline_service/environment_spec.rb
+++ b/spec/services/ci/create_pipeline_service/environment_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :pipeline_composition do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:developer) { create(:user, developer_of: project) }
diff --git a/spec/services/ci/create_pipeline_service/evaluate_runner_tags_spec.rb b/spec/services/ci/create_pipeline_service/evaluate_runner_tags_spec.rb
index cc1c31a0f53c4a1950c6813ac8e1a13e12e95a74..35bca02c565b2dd13d581cfea5d1a2860e0a4ba5 100644
--- a/spec/services/ci/create_pipeline_service/evaluate_runner_tags_spec.rb
+++ b/spec/services/ci/create_pipeline_service/evaluate_runner_tags_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :pipeline_composition do
   let_it_be(:group)          { create(:group, :private) }
   let_it_be(:group_variable) { create(:ci_group_variable, group: group, key: 'RUNNER_TAG', value: 'group') }
diff --git a/spec/services/ci/create_pipeline_service/include_spec.rb b/spec/services/ci/create_pipeline_service/include_spec.rb
index 37bd53d7bea6d7ad0a0464cf8ef47e9a5d1551e0..a79924c14f189100caa7fd75d80ccb66be7df768 100644
--- a/spec/services/ci/create_pipeline_service/include_spec.rb
+++ b/spec/services/ci/create_pipeline_service/include_spec.rb
@@ -2,8 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService,
-  :ci_config_feature_flag_correctness, feature_category: :pipeline_composition do
+RSpec.describe Ci::CreatePipelineService, feature_category: :pipeline_composition do
   include RepoHelpers
 
   context 'include:' do
diff --git a/spec/services/ci/create_pipeline_service/limit_active_jobs_spec.rb b/spec/services/ci/create_pipeline_service/limit_active_jobs_spec.rb
index 68bbdce95e4ae1924ce019f914688e5e156c489d..57eb203ccc25dab2c2d6974bed2d28f49b71111d 100644
--- a/spec/services/ci/create_pipeline_service/limit_active_jobs_spec.rb
+++ b/spec/services/ci/create_pipeline_service/limit_active_jobs_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :continuous_integration do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { project.first_owner }
diff --git a/spec/services/ci/create_pipeline_service/logger_spec.rb b/spec/services/ci/create_pipeline_service/logger_spec.rb
index 18a5ae2e540cd9d4a061003696ccca37af6ed5ad..aee2f9b6370037c84c6e4ab005c84e0ab08d2263 100644
--- a/spec/services/ci/create_pipeline_service/logger_spec.rb
+++ b/spec/services/ci/create_pipeline_service/logger_spec.rb
@@ -3,7 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe Ci::CreatePipelineService, # rubocop: disable RSpec/SpecFilePathForm
-  :ci_config_feature_flag_correctness,
   feature_category: :continuous_integration do
   describe 'pipeline logger' do
     let_it_be(:project) { create(:project, :repository) }
diff --git a/spec/services/ci/create_pipeline_service/merge_requests_spec.rb b/spec/services/ci/create_pipeline_service/merge_requests_spec.rb
index 5a18cd6b993897748b1121b958dfa672251d0e3d..916e3134d55e04ba202e7775ed7a5e39ac954d0e 100644
--- a/spec/services/ci/create_pipeline_service/merge_requests_spec.rb
+++ b/spec/services/ci/create_pipeline_service/merge_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :continuous_integration do
   context 'merge requests handling' do
     let_it_be(:project)  { create(:project, :repository) }
diff --git a/spec/services/ci/create_pipeline_service/needs_spec.rb b/spec/services/ci/create_pipeline_service/needs_spec.rb
index b6708fb62a318699bcbea1bf6965f1f63a53a832..ced3b3a533f20f656d18d00e45763b7c5204a8de 100644
--- a/spec/services/ci/create_pipeline_service/needs_spec.rb
+++ b/spec/services/ci/create_pipeline_service/needs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :pipeline_composition do
   context 'needs' do
     let_it_be(:project) { create(:project, :repository) }
diff --git a/spec/services/ci/create_pipeline_service/parallel_spec.rb b/spec/services/ci/create_pipeline_service/parallel_spec.rb
index c6fc8481a2ca17bef67e6dabc2831e3f236f4a4a..8e59ac8e5410c718930de5afd38db56f96ad43b7 100644
--- a/spec/services/ci/create_pipeline_service/parallel_spec.rb
+++ b/spec/services/ci/create_pipeline_service/parallel_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :continuous_integration do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user)    { project.first_owner }
diff --git a/spec/services/ci/create_pipeline_service/parameter_content_spec.rb b/spec/services/ci/create_pipeline_service/parameter_content_spec.rb
index 2c54cafd57562d4048b2a54fbed324ca633190b3..9dcddd768bdaf1e970e4840f78ada42932db03c3 100644
--- a/spec/services/ci/create_pipeline_service/parameter_content_spec.rb
+++ b/spec/services/ci/create_pipeline_service/parameter_content_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :continuous_integration do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { project.first_owner }
diff --git a/spec/services/ci/create_pipeline_service/parent_child_pipeline_spec.rb b/spec/services/ci/create_pipeline_service/parent_child_pipeline_spec.rb
index 908b630b128d3877941ccbd59cfd47e0f11a0442..80e0b16daeb2601bb4deed71d249d9ddbf0dc965 100644
--- a/spec/services/ci/create_pipeline_service/parent_child_pipeline_spec.rb
+++ b/spec/services/ci/create_pipeline_service/parent_child_pipeline_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, '#execute', :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService, '#execute',
   feature_category: :continuous_integration do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user, developer_of: project) }
diff --git a/spec/services/ci/create_pipeline_service/partitioning_spec.rb b/spec/services/ci/create_pipeline_service/partitioning_spec.rb
index 42c4dddd668ffeb6cd6ddcf613efb1b9966ab78e..1d63b77a006ca41859ee5afbd4fccd0b3cbca763 100644
--- a/spec/services/ci/create_pipeline_service/partitioning_spec.rb
+++ b/spec/services/ci/create_pipeline_service/partitioning_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness, :aggregate_failures,
+RSpec.describe Ci::CreatePipelineService, :aggregate_failures,
   feature_category: :continuous_integration do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user)    { project.first_owner }
diff --git a/spec/services/ci/create_pipeline_service/pre_post_stages_spec.rb b/spec/services/ci/create_pipeline_service/pre_post_stages_spec.rb
index 2eac4ecd4f09f3231236e5994caf408c1438bdc7..c1bb60a640d83681b4cba6bc2599589881889ed3 100644
--- a/spec/services/ci/create_pipeline_service/pre_post_stages_spec.rb
+++ b/spec/services/ci/create_pipeline_service/pre_post_stages_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :continuous_integration do
   describe '.pre/.post stages' do
     let_it_be(:project) { create(:project, :repository) }
diff --git a/spec/services/ci/create_pipeline_service/rate_limit_spec.rb b/spec/services/ci/create_pipeline_service/rate_limit_spec.rb
index 6c9183a484127eafd14313afe6f8963b44ece7b4..5ceca614507c5c2b10becf1742701b8db8980a10 100644
--- a/spec/services/ci/create_pipeline_service/rate_limit_spec.rb
+++ b/spec/services/ci/create_pipeline_service/rate_limit_spec.rb
@@ -3,7 +3,6 @@
 
 RSpec.describe Ci::CreatePipelineService, :freeze_time,
   :clean_gitlab_redis_rate_limiting,
-  :ci_config_feature_flag_correctness,
   feature_category: :continuous_integration do
   describe 'rate limiting' do
     let_it_be(:project) { create(:project, :repository) }
diff --git a/spec/services/ci/create_pipeline_service/rules_spec.rb b/spec/services/ci/create_pipeline_service/rules_spec.rb
index 7de7c4d1044134fcec40ff16c1f4f6c51212b028..24aecf43edaae800994c2d83f80c83c6cdd2755c 100644
--- a/spec/services/ci/create_pipeline_service/rules_spec.rb
+++ b/spec/services/ci/create_pipeline_service/rules_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness, feature_category: :pipeline_composition do
+RSpec.describe Ci::CreatePipelineService, feature_category: :pipeline_composition do
   include Ci::PipelineMessageHelpers
 
   let(:project)     { create(:project, :repository) }
diff --git a/spec/services/ci/create_pipeline_service/run_spec.rb b/spec/services/ci/create_pipeline_service/run_spec.rb
index 45b8156546f1fff8277bfac7932d9425d3eeccd8..500dda0a5a75e16cc0312dc5c72a3b0604f88c06 100644
--- a/spec/services/ci/create_pipeline_service/run_spec.rb
+++ b/spec/services/ci/create_pipeline_service/run_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :pipeline_composition do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user)    { project.first_owner }
diff --git a/spec/services/ci/create_pipeline_service/scripts_spec.rb b/spec/services/ci/create_pipeline_service/scripts_spec.rb
index eaa08907b2dd6f514641c5752f59b75c19b6af61..cc4f71ff6b0d83a5032ed13d9a594d488d2fef88 100644
--- a/spec/services/ci/create_pipeline_service/scripts_spec.rb
+++ b/spec/services/ci/create_pipeline_service/scripts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :continuous_integration do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user)    { project.first_owner }
diff --git a/spec/services/ci/create_pipeline_service/tags_spec.rb b/spec/services/ci/create_pipeline_service/tags_spec.rb
index 3325d4a6c63f8363d3f49b707958de00ef897a85..73174eb3a01eb46f65242df9db62bd730d0d8dc1 100644
--- a/spec/services/ci/create_pipeline_service/tags_spec.rb
+++ b/spec/services/ci/create_pipeline_service/tags_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness, feature_category: :continuous_integration do
+RSpec.describe Ci::CreatePipelineService, feature_category: :continuous_integration do
   describe 'tags:' do
     let_it_be(:project) { create(:project, :repository) }
     let_it_be(:user)    { project.first_owner }
diff --git a/spec/services/ci/create_pipeline_service/variables_spec.rb b/spec/services/ci/create_pipeline_service/variables_spec.rb
index f90f32f80c77752ba16db6335464b8838c6e7207..2b791b53b79d8043cd607e1ec686a4b37f92f15f 100644
--- a/spec/services/ci/create_pipeline_service/variables_spec.rb
+++ b/spec/services/ci/create_pipeline_service/variables_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :secrets_management do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user)    { project.first_owner }
diff --git a/spec/services/ci/create_pipeline_service/workflow_auto_cancel_spec.rb b/spec/services/ci/create_pipeline_service/workflow_auto_cancel_spec.rb
index 5af87c45c6477347a8695e0ebea550e13398f828..11f82942b86e19809690b90c6edae91d792b6c5b 100644
--- a/spec/services/ci/create_pipeline_service/workflow_auto_cancel_spec.rb
+++ b/spec/services/ci/create_pipeline_service/workflow_auto_cancel_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness,
+RSpec.describe Ci::CreatePipelineService,
   feature_category: :pipeline_composition do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user)    { project.first_owner }
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index 5925cb38c8b6f0c22ef268eba23f0b5a6b45e57c..5a04501b67d76f3d2b370c85079752958c414d2e 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :ci_config_feature_flag_correctness, :clean_gitlab_redis_cache, feature_category: :continuous_integration do
+RSpec.describe Ci::CreatePipelineService, :clean_gitlab_redis_cache, feature_category: :continuous_integration do
   include ProjectForksHelper
   include Ci::PipelineMessageHelpers
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b8f2081bee7a243fb0e45e03e0444154e34041fb..e1866700fdb438591395f2918e345d83e5e56818 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -429,7 +429,7 @@
     ::Gitlab::SafeRequestStore.ensure_request_store { example.run }
   end
 
-  config.around(:example, :ci_config_feature_flag_correctness) do |example|
+  config.around do |example|
     ::Gitlab::Ci::Config::FeatureFlags.ensure_correct_usage do
       example.run
     end