diff --git a/payment.xml b/payment.xml
index 98e8b0d42d..a60b32415a 100644
--- a/payment.xml
+++ b/payment.xml
@@ -85,16 +85,16 @@ this repository contains the full copyright notices and license terms. -->
             sequence="30"
             id="menu_mandate_form"/>
 
-        <record model="ir.rule.group" id="rule_group_mandate">
+        <record model="ir.rule.group" id="rule_group_mandate_companies">
             <field name="name">User in company</field>
             <field name="model" search="[('model', '=', 'account.payment.sepa.mandate')]"/>
             <field name="global_p" eval="True"/>
         </record>
-        <record model="ir.rule" id="rule_payment1">
+        <record model="ir.rule" id="rule_payment_companies">
             <field name="domain"
-                eval="[('company', '=', Eval('user', {}).get('company', None))]"
+                eval="[('company', 'in', Eval('companies', []))]"
                 pyson="1"/>
-            <field name="rule_group" ref="rule_group_mandate"/>
+            <field name="rule_group" ref="rule_group_mandate_companies"/>
         </record>
 
         <record model="ir.model.access" id="access_mandate">
@@ -229,17 +229,17 @@ this repository contains the full copyright notices and license terms. -->
             sequence="50"
             id="menu_message_form"/>
 
-        <record model="ir.rule.group" id="rule_group_message">
-            <field name="name">User in company</field>
+        <record model="ir.rule.group" id="rule_group_message_companies">
+            <field name="name">User in companies</field>
             <field name="model"
                 search="[('model', '=', 'account.payment.sepa.message')]"/>
             <field name="global_p" eval="True"/>
         </record>
-        <record model="ir.rule" id="rule_message1">
+        <record model="ir.rule" id="rule_message_companies">
             <field name="domain"
-                eval="[('company', '=', Eval('user', {}).get('company', None))]"
+                eval="[('company', 'in', Eval('companies', []))]"
                 pyson="1"/>
-            <field name="rule_group" ref="rule_group_message"/>
+            <field name="rule_group" ref="rule_group_message_companies"/>
         </record>
 
         <record model="ir.model.access" id="access_message">
diff --git a/tests/test_account_payment_sepa.py b/tests/test_account_payment_sepa.py
index 84f3a362ad..c7f7ee31fd 100644
--- a/tests/test_account_payment_sepa.py
+++ b/tests/test_account_payment_sepa.py
@@ -16,7 +16,7 @@ from trytond.pool import Pool
 
 from trytond.modules.currency.tests import create_currency
 from trytond.modules.company.tests import (
-    create_company, set_company, CompanyMultiValueTestMixin)
+    create_company, set_company, CompanyTestMixin)
 from trytond.modules.account.tests import create_chart
 
 
@@ -148,7 +148,7 @@ def validate_file(flavor, kind, xsd=None):
         schema.assertValid(sepa_xml)
 
 
-class AccountPaymentSepaTestCase(CompanyMultiValueTestMixin, ModuleTestCase):
+class AccountPaymentSepaTestCase(CompanyTestMixin, ModuleTestCase):
     'Test Account Payment SEPA module'
     module = 'account_payment_sepa'