diff --git a/account_banking_mandate/tests/test_invoice_mandate.py b/account_banking_mandate/tests/test_invoice_mandate.py
index c24b9e91a..f7d302120 100644
--- a/account_banking_mandate/tests/test_invoice_mandate.py
+++ b/account_banking_mandate/tests/test_invoice_mandate.py
@@ -18,7 +18,7 @@ class TestInvoiceMandate(TransactionCase):
             lambda s: s.account_id == self.invoice_account
         )
         if payable_move_lines:
-            self.assertEqual(payable_move_lines[0].mandate_id, self.mandate)
+            self.assertEqual(payable_move_lines[0].move_id.mandate_id, self.mandate)
 
         self.env["account.invoice.payment.line.multi"].with_context(
             active_model="account.move", active_ids=self.invoice.ids
@@ -62,7 +62,7 @@ class TestInvoiceMandate(TransactionCase):
         )
         if payable_move_lines:
             with self.assertRaises(UserError):
-                payable_move_lines[0].mandate_id = mandate_2
+                payable_move_lines[0].move_id.mandate_id = mandate_2
 
     def test_post_invoice_and_refund_02(self):
         self.invoice._onchange_partner_id()
diff --git a/account_payment_order/tests/test_payment_order_inbound.py b/account_payment_order/tests/test_payment_order_inbound.py
index b3efd9e1d..886985e0c 100644
--- a/account_payment_order/tests/test_payment_order_inbound.py
+++ b/account_payment_order/tests/test_payment_order_inbound.py
@@ -14,6 +14,7 @@ class TestPaymentOrderInboundBase(SavepointCase):
     def setUpClass(cls):
         self = cls
         super().setUpClass()
+        self.env.user.company_id = self.env.ref("base.main_company").id
         self.inbound_mode = self.env.ref(
             "account_payment_mode.payment_mode_inbound_dd1"
         )
@@ -23,16 +24,22 @@ class TestPaymentOrderInboundBase(SavepointCase):
                     "user_type_id",
                     "=",
                     self.env.ref("account.data_account_type_revenue").id,
-                )
+                ),
+                ("company_id", "=", self.env.user.company_id.id),
             ],
             limit=1,
         )
         self.journal = self.env["account.journal"].search(
-            [("type", "=", "bank")], limit=1
+            [("type", "=", "bank"), ("company_id", "=", self.env.user.company_id.id)],
+            limit=1,
         )
         self.inbound_mode.variable_journal_ids = self.journal
         # Make sure no others orders are present
-        self.domain = [("state", "=", "draft"), ("payment_type", "=", "inbound")]
+        self.domain = [
+            ("state", "=", "draft"),
+            ("payment_type", "=", "inbound"),
+            ("company_id", "=", self.env.user.company_id.id),
+        ]
         self.payment_order_obj = self.env["account.payment.order"]
         self.payment_order_obj.search(self.domain).unlink()
         # Create payment order
diff --git a/account_payment_order/tests/test_payment_order_outbound.py b/account_payment_order/tests/test_payment_order_outbound.py
index e69dfa5c8..8dd5d21b0 100644
--- a/account_payment_order/tests/test_payment_order_outbound.py
+++ b/account_payment_order/tests/test_payment_order_outbound.py
@@ -11,6 +11,7 @@ from odoo.tests.common import TransactionCase
 class TestPaymentOrderOutbound(TransactionCase):
     def setUp(self):
         super(TestPaymentOrderOutbound, self).setUp()
+        self.env.user.company_id = self.env.ref("base.main_company").id
         self.journal = self.env["account.journal"].search(
             [("type", "=", "bank")], limit=1
         )
@@ -22,7 +23,8 @@ class TestPaymentOrderOutbound(TransactionCase):
                         "user_type_id",
                         "=",
                         self.env.ref("account.data_account_type_expenses").id,
-                    )
+                    ),
+                    ("company_id", "=", self.env.user.company_id.id),
                 ],
                 limit=1,
             )
@@ -35,10 +37,15 @@ class TestPaymentOrderOutbound(TransactionCase):
             "account_payment_mode.payment_mode_outbound_dd1"
         )
         self.bank_journal = self.env["account.journal"].search(
-            [("type", "=", "bank")], limit=1
+            [("type", "=", "bank"), ("company_id", "=", self.env.user.company_id.id)],
+            limit=1,
         )
         # Make sure no other payment orders are in the DB
-        self.domain = [("state", "=", "draft"), ("payment_type", "=", "outbound")]
+        self.domain = [
+            ("state", "=", "draft"),
+            ("payment_type", "=", "outbound"),
+            ("company_id", "=", self.env.user.company_id.id),
+        ]
         self.env["account.payment.order"].search(self.domain).unlink()
 
     def _create_supplier_invoice(self):