diff --git a/shipment_advice/README.rst b/shipment_advice/README.rst
index ba716da9..bc5fce3d 100644
--- a/shipment_advice/README.rst
+++ b/shipment_advice/README.rst
@@ -61,7 +61,8 @@ Contributors
 * Simone Orsi <simahawk@gmail.com>
 * `Trobz <https://trobz.com>`_:
   * Dung Tran <dungtd@trobz.com>
-
+  * Tuan Tran <anhtuan@trobz.com>
+  * Tri Doan <tridm@trobz.com>
 Design
 ~~~~~~
 
diff --git a/shipment_advice/readme/CONTRIBUTORS.rst b/shipment_advice/readme/CONTRIBUTORS.rst
index 09f87c8c..a504ee7f 100644
--- a/shipment_advice/readme/CONTRIBUTORS.rst
+++ b/shipment_advice/readme/CONTRIBUTORS.rst
@@ -3,7 +3,8 @@
 * Simone Orsi <simahawk@gmail.com>
 * `Trobz <https://trobz.com>`_:
   * Dung Tran <dungtd@trobz.com>
-
+  * Tuan Tran <anhtuan@trobz.com>
+  * Tri Doan <tridm@trobz.com>
 Design
 ~~~~~~
 
diff --git a/shipment_advice_cash_on_delivery/readme/CONTRIBUTORS.rst b/shipment_advice_cash_on_delivery/readme/CONTRIBUTORS.rst
index e0ae8678..bc6a98d5 100644
--- a/shipment_advice_cash_on_delivery/readme/CONTRIBUTORS.rst
+++ b/shipment_advice_cash_on_delivery/readme/CONTRIBUTORS.rst
@@ -1,3 +1,4 @@
 * Jacques-Etienne Baudoux <je@bcim.be>
 * Souheil Bejaoui <souheil.bejaoui@acsone.eu>
 * Tuan Tran <anhtuan@trobz.com>
+* Tri Doan <tridm@trobz.com>
diff --git a/shipment_advice_cash_on_delivery/tests/test_shipment_advice_cash_on_delivery.py b/shipment_advice_cash_on_delivery/tests/test_shipment_advice_cash_on_delivery.py
index cc5d64f5..09a3af3a 100644
--- a/shipment_advice_cash_on_delivery/tests/test_shipment_advice_cash_on_delivery.py
+++ b/shipment_advice_cash_on_delivery/tests/test_shipment_advice_cash_on_delivery.py
@@ -4,6 +4,7 @@
 
 from odoo import Command
 
+from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT
 from odoo.addons.queue_job.tests.common import trap_jobs
 from odoo.addons.shipment_advice.tests.common import Common
 
@@ -12,6 +13,7 @@ class TestShipmentAdviceCashOnDelivery(Common):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
+        cls.env = cls.env["base"].with_context(**DISABLED_MAIL_CONTEXT).env
         cls.uom_kg = cls.env.ref("uom.product_uom_kgm")
         cls.product = cls.env["product.product"].create(
             {
diff --git a/test-requirements.txt b/test-requirements.txt
index effd4240..73389cb8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,2 +1,3 @@
+openupgradelib
 vcrpy-unittest
 odoo-addon-partner-invoicing-mode-cash-on-delivery @ git+https://github.com/OCA/account-invoicing@refs/pull/1736/head#subdirectory=setup/partner_invoicing_mode_cash_on_delivery