--- a/Gemfile
+++ b/Gemfile
@@ -329,7 +329,7 @@
   gem 'raindrops', '~> 0.18'
 end
 
-group :development, :test do
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
   gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
   gem 'pry-byebug', '~> 3.5.1', platform: :mri
   gem 'pry-rails', '~> 0.3.4'
@@ -369,14 +369,10 @@
   gem 'simple_po_parser', '~> 1.1.2', require: false
 
   gem 'timecop', '~> 0.8.0'
-end
 
 # Gems required in omnibus-gitlab pipeline
-group :development, :test, :omnibus do
   gem 'license_finder', '~> 5.4', require: false
-end
 
-group :test do
   gem 'fuubar', '~> 2.2.0'
   gem 'rspec-retry', '~> 0.6.1'
   gem 'rspec_profiling', '~> 0.0.5'