diff --git a/modules/account_payment_clearing/payment.py b/modules/account_payment_clearing/payment.py
index ecb16481b8..9d2f5b1730 100644
--- a/modules/account_payment_clearing/payment.py
+++ b/modules/account_payment_clearing/payment.py
@@ -31,6 +31,9 @@ class Journal(metaclass=PoolMeta):
     clearing_journal = fields.Many2One('account.journal', 'Clearing Journal',
         states={
             'required': Bool(Eval('clearing_account')),
+            },
+        context={
+            'company': Eval('company', None),
             })
     clearing_posting_delay = fields.TimeDelta(
         "Clearing Posting Delay",
diff --git a/modules/account_payment_clearing/tests/test_module.py b/modules/account_payment_clearing/tests/test_module.py
index 7eb2045679..4492083c0f 100644
--- a/modules/account_payment_clearing/tests/test_module.py
+++ b/modules/account_payment_clearing/tests/test_module.py
@@ -1,10 +1,11 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 
+from trytond.modules.company.tests import CompanyTestMixin
 from trytond.tests.test_tryton import ModuleTestCase
 
 
-class AccountPaymentTestCase(ModuleTestCase):
+class AccountPaymentTestCase(CompanyTestMixin, ModuleTestCase):
     'Test Account Payment module'
     module = 'account_payment_clearing'
     extras = ['account_statement', 'account_statement_rule']
diff --git a/modules/account_payment_clearing/tryton.cfg b/modules/account_payment_clearing/tryton.cfg
index ed4959d27a..5b68753fde 100644
--- a/modules/account_payment_clearing/tryton.cfg
+++ b/modules/account_payment_clearing/tryton.cfg
@@ -1,6 +1,7 @@
 [tryton]
 version=7.5.0
 depends:
+    company
     account
     account_payment
     ir