diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py
index 061f736ca..8255b5adf 100644
--- a/src/paperless_mail/tests/test_mail.py
+++ b/src/paperless_mail/tests/test_mail.py
@@ -1612,7 +1612,7 @@ class TestMailAccountTestView(APITestCase):
         def get_mailbox(server, port, security):
             return mock.MagicMock()
 
-        mock_get_mailbox.side_effect = get_mailbox
+        mock_get_mailbox.__enter__.return_value = get_mailbox
 
         def mock_mailbox_login(mailbox, account):
             return True