diff --git a/Gemfile b/Gemfile
index 1a782f329848870d42f7537426208a402cbf7213..be1dc4bf20a8e998829baf234d8517042628ef44 100644
--- a/Gemfile
+++ b/Gemfile
@@ -461,7 +461,6 @@ group :development, :test do
   gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 
   gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database
-  gem 'factory_bot_rails', '~> 6.4.3' # rubocop:todo Gemfile/MissingFeatureCategory
   gem 'rspec-rails', '~> 6.1.1', feature_category: :shared
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
@@ -533,6 +532,7 @@ group :test do
   gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling
   gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling
   gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling
+  gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling
 
   gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory
   gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory
diff --git a/lib/gitlab/environment.rb b/lib/gitlab/environment.rb
index 86094727df5e35fdfc00a85550f2d7f346904cfa..7189c64ffaaa7fcd98f17ef66447c7ed24150e78 100644
--- a/lib/gitlab/environment.rb
+++ b/lib/gitlab/environment.rb
@@ -2,8 +2,12 @@
 
 module Gitlab
   module Environment
+    extend ::Gitlab::Utils::StrongMemoize
+
     def self.hostname
-      @hostname ||= ENV['HOSTNAME'] || Socket.gethostname
+      strong_memoize(:hostname) do
+        ENV['HOSTNAME'] || Socket.gethostname
+      end
     end
 
     # Check whether codebase is going through static verification
@@ -12,9 +16,10 @@ def self.hostname
     # @return [Boolean] Is the code going through static verification?
     def self.static_verification?
       static_verification = Gitlab::Utils.to_boolean(ENV['STATIC_VERIFICATION'], default: false)
-      env_production = ENV['RAILS_ENV'] == 'production'
 
-      warn '[WARNING] Static Verification bypass is enabled in Production.' if static_verification && env_production
+      if static_verification && Rails.env.production?
+        warn '[WARNING] Static Verification bypass is enabled in Production.'
+      end
 
       static_verification
     end
diff --git a/spec/lib/gitlab/environment_spec.rb b/spec/lib/gitlab/environment_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d4102090a8b6d4b5da38cbcede65f00495433128
--- /dev/null
+++ b/spec/lib/gitlab/environment_spec.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Environment, feature_category: :shared do
+  describe '#hostname' do
+    before do
+      described_class.clear_memoization(:hostname)
+    end
+
+    it 'returns the hostname from the HOSTNAME environment variable' do
+      stub_env('HOSTNAME', 'example.com')
+
+      expect(described_class.hostname).to eq('example.com')
+    end
+
+    it 'returns the system hostname if the HOSTNAME environment variable is not set' do
+      stub_env('HOSTNAME', nil)
+      allow(Socket).to receive(:gethostname).and_return('localhost')
+
+      expect(described_class.hostname).to eq('localhost')
+    end
+  end
+
+  describe '#static_verification?' do
+    it 'returns true if STATIC_VERIFICATION is set to true and the environment is production' do
+      stub_env('STATIC_VERIFICATION', 'true')
+      allow(Rails.env).to receive(:production?).and_return(true)
+
+      expect(described_class.static_verification?).to be true
+    end
+
+    it 'returns false if STATIC_VERIFICATION is set to false' do
+      stub_env('STATIC_VERIFICATION', 'false')
+
+      expect(described_class.static_verification?).to be false
+    end
+
+    it 'returns false if STATIC_VERIFICATION is not set and the environment is not production' do
+      stub_env('STATIC_VERIFICATION', nil)
+      allow(Rails.env).to receive(:production?).and_return(false)
+
+      expect(described_class.static_verification?).to be false
+    end
+  end
+end