diff --git a/account_payment_order/demo/payment_demo.xml b/account_payment_order/demo/payment_demo.xml
index 40f7c165e..584bba5de 100644
--- a/account_payment_order/demo/payment_demo.xml
+++ b/account_payment_order/demo/payment_demo.xml
@@ -28,5 +28,9 @@
     <field name="default_journal_ids" search="[('type', 'in', ('sale', 'sale_refund')), ('company_id', '=', ref('base.main_company'))]"/>
 </record>
 
+<!-- without this, account tests fail /-->
+<record id="account.group_account_manager" model="res.groups">
+    <field name="implied_ids" eval="[(4, ref('group_account_payment'))]" />
+</record>
 
 </odoo>
diff --git a/account_payment_order/models/account_move_line.py b/account_payment_order/models/account_move_line.py
index f5c251624..ca2fb04e8 100644
--- a/account_payment_order/models/account_move_line.py
+++ b/account_payment_order/models/account_move_line.py
@@ -132,5 +132,8 @@ class AccountMoveLine(models.Model):
                 doc.remove(elem)
             for elem in doc.xpath("//field[@name='credit']"):
                 doc.remove(elem)
-            result['arch'] = etree.tostring(doc)
+            arch, fields = self.env['ir.ui.view'].postprocess_and_fields(
+                self._name, doc, view_id,
+            )
+            result.update(arch=arch, fields=fields)
         return result
diff --git a/account_payment_order/tests/test_account_payment.py b/account_payment_order/tests/test_account_payment.py
index e8f98b52e..981c5ff21 100644
--- a/account_payment_order/tests/test_account_payment.py
+++ b/account_payment_order/tests/test_account_payment.py
@@ -1,6 +1,7 @@
 # Copyright 2019 ACSONE SA/NV
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+import unittest
 from odoo.tests.common import SavepointCase
 
 
@@ -25,6 +26,8 @@ class TestAccountPayment(SavepointCase):
         # Journals
         cls.bank_journal = cls.account_journal_model.search(
             [('type', '=', 'bank')], limit=1)
+        if not cls.bank_journal:
+            raise unittest.SkipTest('No journals defined')
         cls.bank_journal.inbound_payment_method_ids = [
             (6, 0, [cls.inbound_payment_method_01.id,
                     cls.inbound_payment_method_02.id])]
diff --git a/account_payment_order/tests/test_payment_mode.py b/account_payment_order/tests/test_payment_mode.py
index b56d518e4..a46c4b73b 100644
--- a/account_payment_order/tests/test_payment_mode.py
+++ b/account_payment_order/tests/test_payment_mode.py
@@ -1,6 +1,7 @@
 # © 2017 Creu Blanca
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
+import unittest
 from odoo.tests.common import TransactionCase
 from odoo.exceptions import ValidationError
 
@@ -10,6 +11,9 @@ class TestPaymentMode(TransactionCase):
     def setUp(self):
         super(TestPaymentMode, self).setUp()
 
+        if not self.env['account.account'].search([]):
+            raise unittest.SkipTest('No accounts defined')
+
         # Company
         self.company = self.env.ref('base.main_company')
 
diff --git a/account_payment_order/tests/test_payment_order_inbound.py b/account_payment_order/tests/test_payment_order_inbound.py
index 727f5a8e1..f6e1a9ea9 100644
--- a/account_payment_order/tests/test_payment_order_inbound.py
+++ b/account_payment_order/tests/test_payment_order_inbound.py
@@ -3,6 +3,7 @@
 # Copyright 2019 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
+import unittest
 from odoo.tests.common import SavepointCase
 from odoo.exceptions import ValidationError, UserError
 from datetime import date, timedelta
@@ -24,6 +25,8 @@ class TestPaymentOrderInboundBase(SavepointCase):
              '|', ('company_id', '=', cls.env.user.company_id.id),
              ('company_id', '=', False)], limit=1
         )
+        if not cls.journal:
+            raise unittest.SkipTest('No journal found')
         cls.inbound_mode.variable_journal_ids = cls.journal
         # Make sure no others orders are present
         cls.domain = [
diff --git a/account_payment_order/tests/test_payment_order_outbound.py b/account_payment_order/tests/test_payment_order_outbound.py
index 1557e555e..ee9de9587 100644
--- a/account_payment_order/tests/test_payment_order_outbound.py
+++ b/account_payment_order/tests/test_payment_order_outbound.py
@@ -1,7 +1,7 @@
 # © 2017 Camptocamp SA
 # © 2017 Creu Blanca
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-
+import unittest
 from datetime import date, datetime, timedelta
 from odoo.exceptions import UserError, ValidationError
 from odoo.tests.common import SavepointCase
@@ -17,6 +17,8 @@ class TestPaymentOrderOutbound(SavepointCase):
             [('user_type_id', '=', cls.env.ref(
                 'account.data_account_type_expenses').id)],
             limit=1).id
+        if not cls.invoice_line_account:
+            raise unittest.SkipTest('No account found')
         cls.invoice = cls._create_supplier_invoice()
         cls.invoice_02 = cls._create_supplier_invoice()
         cls.mode = cls.env.ref(
diff --git a/account_payment_partner/tests/test_account_payment_partner.py b/account_payment_partner/tests/test_account_payment_partner.py
index 78c43d7c9..24ab563c8 100644
--- a/account_payment_partner/tests/test_account_payment_partner.py
+++ b/account_payment_partner/tests/test_account_payment_partner.py
@@ -1,6 +1,7 @@
 # Copyright 2017 Eficent Business and IT Consulting Services S.L.
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 
+import unittest
 from odoo import fields, _
 from odoo.tests import common
 from odoo.exceptions import ValidationError
@@ -31,8 +32,10 @@ class TestAccountPaymentPartner(common.SavepointCase):
         if charts:
             cls.chart = charts[0]
         else:
-            raise ValidationError(
+            cls.tearDownClass()
+            raise unittest.SkipTest(
                 _("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_for_current_company()
diff --git a/account_payment_sale/tests/common.py b/account_payment_sale/tests/common.py
index 369c8a8f4..c94b23502 100644
--- a/account_payment_sale/tests/common.py
+++ b/account_payment_sale/tests/common.py
@@ -1,6 +1,7 @@
 # Copyright 2018 Camptocamp
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+import unittest
 from odoo.tests.common import SavepointCase
 
 
@@ -10,6 +11,9 @@ class CommonTestCase(SavepointCase):
     def setUpClass(cls):
         super().setUpClass()
 
+        if not cls.env['account.account'].search([]):
+            raise unittest.SkipTest('No accounts defined')
+
         cls.bank = cls.env["res.partner.bank"].create({
             'acc_number': 'test',
             'partner_id': cls.env.user.company_id.partner_id.id,