diff --git a/account_credit_control/__manifest__.py b/account_credit_control/__manifest__.py
index 3c4c390bb..9d7e8820e 100644
--- a/account_credit_control/__manifest__.py
+++ b/account_credit_control/__manifest__.py
@@ -3,7 +3,7 @@
 # Copyright 2018 Access Bookings Ltd (https://accessbookings.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {'name': 'Account Credit Control',
- 'version': '11.0.1.0.3',
+ 'version': '11.0.1.0.4',
  'author': "Camptocamp,"
            "Odoo Community Association (OCA),"
            "Okia,"
diff --git a/account_credit_control/models/credit_control_policy.py b/account_credit_control/models/credit_control_policy.py
index 050476f3b..e34c5b81f 100644
--- a/account_credit_control/models/credit_control_policy.py
+++ b/account_credit_control/models/credit_control_policy.py
@@ -79,7 +79,7 @@ class CreditControlPolicy(models.Model):
         """
         self.ensure_one()
         # MARK possible place for a good optimisation
-        my_obj = self.env[model]
+        my_obj = self.env[model].with_context(active_test=False)
         default_domain = self._move_lines_domain(controlling_date)
 
         to_add = self.env['account.move.line']
diff --git a/account_credit_control/tests/test_account_invoice.py b/account_credit_control/tests/test_account_invoice.py
index b68ece14c..d971510c8 100644
--- a/account_credit_control/tests/test_account_invoice.py
+++ b/account_credit_control/tests/test_account_invoice.py
@@ -89,7 +89,7 @@ class TestAccountInvoice(TransactionCase):
         })
         control_run.generate_credit_lines()
 
-        self.assertTrue(len(invoice.credit_control_line_ids), 1)
+        self.assertEqual(len(invoice.credit_control_line_ids), 1)
         control_line = invoice.credit_control_line_ids
 
         control_marker = self.env['credit.control.marker']
diff --git a/account_credit_control/tests/test_credit_control_run.py b/account_credit_control/tests/test_credit_control_run.py
index 7aa9f1aaf..1d1634365 100644
--- a/account_credit_control/tests/test_credit_control_run.py
+++ b/account_credit_control/tests/test_credit_control_run.py
@@ -109,7 +109,7 @@ class TestCreditControlRun(TransactionCase):
 
         control_run.with_context(lang='en_US').generate_credit_lines()
 
-        self.assertTrue(len(self.invoice.credit_control_line_ids), 1)
+        self.assertEqual(len(self.invoice.credit_control_line_ids), 1)
         self.assertEqual(control_run.state, 'done')
 
         report_regex = \
@@ -135,7 +135,7 @@ class TestCreditControlRun(TransactionCase):
             'policy_ids': [(6, 0, [self.policy.id])]
         })
         first_control_run.with_context(lang='en_US').generate_credit_lines()
-        self.assertTrue(len(self.invoice.credit_control_line_ids), 1)
+        self.assertEqual(len(self.invoice.credit_control_line_ids), 1)
 
         # Second run
         second_control_run = self.env['credit.control.run'].create({
@@ -143,7 +143,7 @@ class TestCreditControlRun(TransactionCase):
             'policy_ids': [(6, 0, [self.policy.id])]
         })
         second_control_run.with_context(lang='en_US').generate_credit_lines()
-        self.assertTrue(len(self.invoice.credit_control_line_ids), 2)
+        self.assertEqual(len(self.invoice.credit_control_line_ids), 2)
 
         # Last run
         last_control_run = self.env['credit.control.run'].create({
@@ -151,7 +151,7 @@ class TestCreditControlRun(TransactionCase):
             'policy_ids': [(6, 0, [self.policy.id])]
         })
         last_control_run.with_context(lang='en_US').generate_credit_lines()
-        self.assertTrue(len(self.invoice.credit_control_line_ids), 2)
+        self.assertEqual(len(self.invoice.credit_control_line_ids), 3)
 
     def test_wiz_print_lines(self):
         """