diff --git a/test/functional/mail_handler_controller_test.rb b/test/functional/mail_handler_controller_test.rb
index 3b7167900..45dfbace9 100644
--- a/test/functional/mail_handler_controller_test.rb
+++ b/test/functional/mail_handler_controller_test.rb
@@ -81,17 +81,20 @@ class MailHandlerControllerTest < Redmine::ControllerTest
 
   def test_should_update_issue
     # Enable API and set a key
-    Setting.mail_handler_api_enabled = 1
-    Setting.mail_handler_api_key = 'secret'
-    assert_no_difference 'Issue.count' do
-      assert_difference 'Journal.count' do
-        post(
-          :index,
-          :params => {
-            :key => 'secret',
-            :email => IO.read(File.join(FIXTURES_PATH, 'ticket_reply.eml'))
-          }
-        )
+    with_settings(
+      :mail_handler_api_enabled => 1,
+      :mail_handler_api_key => 'secret'
+    ) do
+      assert_no_difference 'Issue.count' do
+        assert_difference 'Journal.count' do
+          post(
+            :index,
+            :params => {
+              :key => 'secret',
+              :email => IO.read(File.join(FIXTURES_PATH, 'ticket_reply.eml'))
+            }
+          )
+        end
       end
     end
     assert_response 201