diff --git a/account_payment_partner/tests/test_account_payment_partner.py b/account_payment_partner/tests/test_account_payment_partner.py
index bdf4d0204..3e0dcd33b 100644
--- a/account_payment_partner/tests/test_account_payment_partner.py
+++ b/account_payment_partner/tests/test_account_payment_partner.py
@@ -31,10 +31,7 @@ class TestAccountPaymentPartner(SavepointCase):
             cls.chart = charts[0]
         else:
             raise ValidationError(_("No Chart of Account Template has been defined !"))
-        old_company = cls.env.user.company_id
-        cls.env.user.company_id = cls.company_2.id
-        cls.chart.try_loading()
-        cls.env.user.company_id = old_company.id
+        cls.chart.with_company(cls.company_2).try_loading()
 
         # refs
         cls.manual_out = cls.env.ref("account.account_payment_method_manual_out")