diff --git a/test/functional/account_controller_openid_test.rb b/test/functional/account_controller_openid_test.rb
index 7ed03d00c..1a51fc879 100644
--- a/test/functional/account_controller_openid_test.rb
+++ b/test/functional/account_controller_openid_test.rb
@@ -62,7 +62,6 @@ class AccountControllerOpenidTest < Redmine::ControllerTest
     end
 
     def test_login_with_openid_for_existing_non_active_user
-      Setting.self_registration = '2'
       existing_user = User.new(:firstname => 'Cool',
                                :lastname => 'User',
                                :mail => 'user@somedomain.com',
@@ -70,13 +69,12 @@ class AccountControllerOpenidTest < Redmine::ControllerTest
                                :status => User::STATUS_REGISTERED)
       existing_user.login = 'cool_user'
       assert existing_user.save!
-
-      post(
-        :login,
-        :params => {
-          :openid_url => existing_user.identity_url
-        }
-      )
+      with_settings(
+        :openid => '1',
+        :self_registration => '2'
+      ) do
+        post(:login, :params => {:openid_url => existing_user.identity_url})
+      end
       assert_redirected_to '/login'
     end