diff --git a/ee/spec/lib/gitlab/auth/group_saml/auth_hash_spec.rb b/ee/spec/lib/gitlab/auth/group_saml/auth_hash_spec.rb
index 834531114b9c9901ea79dba26e33212b92981989..da23d4dd19ff80a12eae55bcc4510fd1510d65d5 100644
--- a/ee/spec/lib/gitlab/auth/group_saml/auth_hash_spec.rb
+++ b/ee/spec/lib/gitlab/auth/group_saml/auth_hash_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Auth::GroupSaml::AuthHash do
+RSpec.describe Gitlab::Auth::GroupSaml::AuthHash, feature_category: :system_access do
   let(:omniauth_auth_hash) do
     OmniAuth::AuthHash.new(extra: { raw_info: OneLogin::RubySaml::Attributes.new(raw_info_attr) })
   end
diff --git a/ee/spec/lib/gitlab/auth/saml/user_spec.rb b/ee/spec/lib/gitlab/auth/saml/user_spec.rb
index 052dba883738cb376c644d524223fea4ecab620b..f4d31fb03981e667c9cfb25d39e3a5d9b27cae6e 100644
--- a/ee/spec/lib/gitlab/auth/saml/user_spec.rb
+++ b/ee/spec/lib/gitlab/auth/saml/user_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Auth::Saml::User do
+RSpec.describe Gitlab::Auth::Saml::User, feature_category: :system_access do
   include LdapHelpers
   include LoginHelpers
 
diff --git a/spec/lib/gitlab/auth/saml/auth_hash_spec.rb b/spec/lib/gitlab/auth/saml/auth_hash_spec.rb
index 02c15484e4643c3ef144e60c49467aefb7d22335..176250da0f2a6fb98a0665e47516b13dd3e4d73b 100644
--- a/spec/lib/gitlab/auth/saml/auth_hash_spec.rb
+++ b/spec/lib/gitlab/auth/saml/auth_hash_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Auth::Saml::AuthHash do
+RSpec.describe Gitlab::Auth::Saml::AuthHash, feature_category: :system_access do
   include LoginHelpers
 
   let(:raw_info_attr) { { 'groups' => %w[Developers Freelancers] } }
diff --git a/spec/support/helpers/login_helpers.rb b/spec/support/helpers/login_helpers.rb
index 600b652acf49fe2a40c8aa4553820eaf709dccbf..f9963ae98bd9c37bae53b9260d3943963be9712d 100644
--- a/spec/support/helpers/login_helpers.rb
+++ b/spec/support/helpers/login_helpers.rb
@@ -181,7 +181,7 @@ def configure_mock_auth(provider, uid, email, response_object: nil, additional_i
         ),
         response_object: response_object
       }
-    }).merge(additional_info) { |_, old_hash, new_hash| old_hash.merge(new_hash) }
+    }).merge(additional_info)
   end
 
   def mock_auth_hash(provider, uid, email, additional_info: {}, response_object: nil, name: 'mockuser', groups: [])