diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index c87d54b9bd48101f3585c2c0bf7d050661e7177c..6657b4faceb593e27617f202bb34a6729af7550a 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -160,6 +160,10 @@
     end
 end
 
+# Fill out default Settings for omniauth-saml
+
+OmniAuth::Strategies::SAML.default_options['message_max_bytesize'] = Settings.omniauth['saml_message_max_byte_size']
+
 # SAML should be enabled for the tests automatically, but only for EE.
 saml_provider_enabled = Settings.omniauth.providers.any? do |provider|
   provider['name'] == 'group_saml'
diff --git a/scripts/setup-test-env b/scripts/setup-test-env
index 50bec46b71acdf7d19e053acbf8fad5e0d399375..a9d1be7a0cee161c01c2d66290687fbebe22e822 100755
--- a/scripts/setup-test-env
+++ b/scripts/setup-test-env
@@ -24,6 +24,7 @@ require_relative '../lib/system_check/helpers'
 # Required for config/initializers/1_settings.rb
 require 'omniauth'
 require 'omniauth-github'
+require 'omniauth-saml'
 require 'etc'
 require 'gitlab/utils/all'
 require 'gitlab/safe_request_store'