diff --git a/setup.py b/setup.py
index b0c023fe72..593924b92e 100755
--- a/setup.py
+++ b/setup.py
@@ -142,13 +142,13 @@ setup(name=name,
     license='GPL-3',
     python_requires='>=3.7',
     install_requires=requires,
+    extras_require={
+        'test': tests_require,
+        },
     dependency_links=dependency_links,
     zip_safe=False,
     entry_points="""
     [trytond.modules]
     carrier_percentage = trytond.modules.carrier_percentage
     """,
-    test_suite='tests',
-    test_loader='trytond.test_loader:Loader',
-    tests_require=tests_require,
     )
diff --git a/tests/__init__.py b/tests/__init__.py
index 7f9df00e12..4effdfa4a2 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,10 +1,2 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-
-try:
-    from trytond.modules.carrier_percentage.tests.test_carrier_percentage import \
-        suite  # noqa: E501
-except ImportError:
-    from .test_carrier_percentage import suite
-
-__all__ = ['suite']
diff --git a/tests/test_carrier_percentage.py b/tests/test_module.py
similarity index 75%
rename from tests/test_carrier_percentage.py
rename to tests/test_module.py
index 024aeab20d..77471042f0 100644
--- a/tests/test_carrier_percentage.py
+++ b/tests/test_module.py
@@ -1,14 +1,11 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-import doctest
-import unittest
+
 from decimal import Decimal
 
-import trytond.tests.test_tryton
 from trytond.modules.currency.tests import create_currency
 from trytond.pool import Pool
-from trytond.tests.test_tryton import (
-    ModuleTestCase, doctest_checker, doctest_teardown, with_transaction)
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
 
 
 class CarrierPercentageTestCase(ModuleTestCase):
@@ -58,13 +55,4 @@ class CarrierPercentageTestCase(ModuleTestCase):
                 (price, currency.id))
 
 
-def suite():
-    suite = trytond.tests.test_tryton.suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-            CarrierPercentageTestCase))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_carrier_percentage_with_purchase_shipment_cost.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    return suite
+del ModuleTestCase
diff --git a/tests/test_scenario.py b/tests/test_scenario.py
new file mode 100644
index 0000000000..c80e682a7f
--- /dev/null
+++ b/tests/test_scenario.py
@@ -0,0 +1,22 @@
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+import doctest
+import glob
+import os
+
+from trytond.tests.test_tryton import doctest_checker, doctest_teardown
+
+
+def load_tests(loader, tests, pattern):
+    cwd = os.getcwd()
+    try:
+        os.chdir(os.path.dirname(__file__))
+        for scenario in glob.glob('*.rst'):
+            tests.addTests(doctest.DocFileSuite(
+                    scenario, tearDown=doctest_teardown, encoding='utf-8',
+                    checker=doctest_checker,
+                    optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
+    finally:
+        os.chdir(cwd)
+    return tests
diff --git a/tox.ini b/tox.ini
index 5042344413..614b05cde5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,9 @@
 envlist = {py37,py38,py39,py310}-{sqlite,postgresql}
 
 [testenv]
+extras = test
 commands =
-    coverage run --include=.*/carrier_percentage/* setup.py test
+    coverage run --include=.*/carrier_percentage/* -m unittest discover -s tests
     coverage report --include=.*/carrier_percentage/* --omit=*/tests/*
 deps =
     coverage