diff --git a/debian/patches/0499-30-remove-guard-rspec.patch b/debian/patches/0499-30-remove-guard-rspec.patch
new file mode 100644
index 0000000000..78a3f88830
--- /dev/null
+++ b/debian/patches/0499-30-remove-guard-rspec.patch
@@ -0,0 +1,10 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -369,7 +369,6 @@
+   gem 'concurrent-ruby', '~> 1.1'
+   gem 'test-prof', '~> 0.12.0'
+   gem 'rspec_junit_formatter'
+-  gem 'guard-rspec'
+ 
+   # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
+   gem 'derailed_benchmarks', require: false
diff --git a/debian/patches/0499-disable-png-quantizator.patch b/debian/patches/0499-disable-png-quantizator.patch
deleted file mode 100644
index 5f10f849a0..0000000000
--- a/debian/patches/0499-disable-png-quantizator.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -350,8 +350,6 @@
- 
-   gem 'timecop', '~> 0.9.1'
- 
--  gem 'png_quantizator', '~> 0.2.1', require: false
--
-   gem 'parallel', '~> 1.19', require: false
- 
-   gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
diff --git a/debian/patches/0760-remove-simplecov-cobertura.patch b/debian/patches/0760-remove-simplecov-cobertura.patch
new file mode 100644
index 0000000000..4930d80e7a
--- /dev/null
+++ b/debian/patches/0760-remove-simplecov-cobertura.patch
@@ -0,0 +1,10 @@
+--- a/spec/simplecov_env.rb
++++ b/spec/simplecov_env.rb
+@@ -1,7 +1,6 @@
+ # frozen_string_literal: true
+ 
+ require 'simplecov'
+-require 'simplecov-cobertura'
+ require 'active_support/core_ext/numeric/time'
+ require_relative '../lib/gitlab/utils'
+ 
diff --git a/debian/patches/0770-remove-capybara-screenshot-rspec.patch b/debian/patches/0770-remove-capybara-screenshot-rspec.patch
new file mode 100644
index 0000000000..f7f8b8dc20
--- /dev/null
+++ b/debian/patches/0770-remove-capybara-screenshot-rspec.patch
@@ -0,0 +1,29 @@
+--- a/spec/support/capybara.rb
++++ b/spec/support/capybara.rb
+@@ -3,7 +3,6 @@
+ # rubocop:disable Style/GlobalVars
+ require 'capybara/rails'
+ require 'capybara/rspec'
+-require 'capybara-screenshot/rspec'
+ require 'selenium-webdriver'
+ 
+ # Give CI some extra time
+@@ -82,18 +81,6 @@
+ Capybara.default_normalize_ws = true
+ Capybara.enable_aria_label = true
+ 
+-Capybara::Screenshot.append_timestamp = false
+-
+-Capybara::Screenshot.register_filename_prefix_formatter(:rspec) do |example|
+-  example.full_description.downcase.parameterize(separator: "_")[0..99]
+-end
+-# Keep only the screenshots generated from the last failing test suite
+-Capybara::Screenshot.prune_strategy = :keep_last_run
+-# From https://github.com/mattheworiordan/capybara-screenshot/issues/84#issuecomment-41219326
+-Capybara::Screenshot.register_driver(:chrome) do |driver, path|
+-  driver.browser.save_screenshot(path)
+-end
+-
+ RSpec.configure do |config|
+   config.include CapybaraHelpers, type: :feature
+ 
diff --git a/debian/patches/0770-remove-rubocop-rspec.patch b/debian/patches/0770-remove-rubocop-rspec.patch
new file mode 100644
index 0000000000..333b7dbce2
--- /dev/null
+++ b/debian/patches/0770-remove-rubocop-rspec.patch
@@ -0,0 +1,10 @@
+--- a/spec/support/rspec.rb
++++ b/spec/support/rspec.rb
+@@ -5,7 +5,6 @@
+ require_relative "helpers/stub_object_storage"
+ require_relative "helpers/stub_env"
+ require_relative "helpers/fast_rails_root"
+-require 'rubocop/rspec/support'
+ 
+ RSpec.configure do |config|
+   config.mock_with :rspec
diff --git a/debian/patches/series b/debian/patches/series
index 4eaedfc0bc..4e8e496142 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,9 +13,9 @@
 0485-relax-gitlab-sidekiq-fetcher.patch
 0486-relax-sidekiq.patch
 0488-relax-bullet.patch
-0499-disable-png-quantizator.patch
 0499-10-relax-capybara.patch
 0499-20-remove-capybara-screenshot.patch
+0499-30-remove-guard-rspec.patch
 0500-set-webpack-root.patch
 0510-remove-dev-dependencies.patch
 0520-add-system-lib-path-for-webpack.patch
@@ -28,3 +28,6 @@
 0710-use-yarnpkg.patch
 0740-use-packaged-modules.patch
 0750-fix-relative-paths.patch
+0760-remove-simplecov-cobertura.patch
+0770-remove-rubocop-rspec.patch
+0770-remove-capybara-screenshot-rspec.patch