diff --git a/config/settings.rb b/config/settings.rb
index 3edbcc9b5edf46dd4f9dbd4ad465c8f551c4d399..9abbbc11899c6487dd5489560e8adafd599b2a78 100644
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -3,11 +3,10 @@
 require_relative '../lib/gitlab_settings'
 
 file = ENV.fetch('GITLAB_CONFIG') { Rails.root.join('config/gitlab.yml') }
-section = ENV.fetch('GITLAB_ENV') { Rails.env }
 
 GITLAB_INSTANCE_UUID_NOT_SET = 'uuid-not-set'
 
-Settings = GitlabSettings.load(file, section) do
+Settings = GitlabSettings.load(file, Rails.env) do
   def gitlab_on_standard_port?
     on_standard_port?(gitlab)
   end
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb
index d03f8b18b3e0412ad4afdb2221e0218598a08760..7ffab4554cfa34ae0050e366b79225e7167afaa4 100644
--- a/spec/fast_spec_helper.rb
+++ b/spec/fast_spec_helper.rb
@@ -8,7 +8,6 @@
 
 require_relative '../config/bundler_setup'
 
-ENV['GITLAB_ENV'] = 'test'
 ENV['IN_MEMORY_APPLICATION_SETTINGS'] = 'true'
 
 require './spec/deprecation_warnings'