diff --git a/account_credit_control/__manifest__.py b/account_credit_control/__manifest__.py
index aed16c08f..99d42a580 100644
--- a/account_credit_control/__manifest__.py
+++ b/account_credit_control/__manifest__.py
@@ -3,7 +3,7 @@
 # Copyright 2017 Okia SPRL (https://okia.be)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {'name': 'Account Credit Control',
- 'version': '10.0.1.4.4',
+ 'version': '10.0.1.4.5',
  'author': "Camptocamp,Odoo Community Association (OCA),Okia",
  'maintainer': 'Camptocamp',
  'category': 'Finance',
diff --git a/account_credit_control/models/credit_control_policy.py b/account_credit_control/models/credit_control_policy.py
index dfe3e8902..51198624c 100644
--- a/account_credit_control/models/credit_control_policy.py
+++ b/account_credit_control/models/credit_control_policy.py
@@ -81,7 +81,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 9f920b4c0..44e2b2d8f 100644
--- a/account_credit_control/tests/test_account_invoice.py
+++ b/account_credit_control/tests/test_account_invoice.py
@@ -90,7 +90,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 ac7c83196..e6a510a6c 100644
--- a/account_credit_control/tests/test_credit_control_run.py
+++ b/account_credit_control/tests/test_credit_control_run.py
@@ -110,7 +110,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 = \
@@ -136,7 +136,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({
@@ -144,7 +144,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({
@@ -152,4 +152,4 @@ 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)