diff --git a/setup.py b/setup.py
index bd9cb190da..6d9ee967ca 100755
--- a/setup.py
+++ b/setup.py
@@ -143,13 +143,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]
     account_payment = trytond.modules.account_payment
     """,
-    test_suite='tests',
-    test_loader='trytond.test_loader:Loader',
-    tests_require=tests_require,
     )
diff --git a/tests/__init__.py b/tests/__init__.py
index 6482b9ad19..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.account_payment.tests.test_account_payment import \
-        suite  # noqa: E501
-except ImportError:
-    from .test_account_payment import suite
-
-__all__ = ['suite']
diff --git a/tests/test_account_payment.py b/tests/test_account_payment.py
deleted file mode 100644
index bbe1369897..0000000000
--- a/tests/test_account_payment.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
-
-import trytond.tests.test_tryton
-from trytond.modules.company.tests import (
-    CompanyTestMixin, PartyCompanyCheckEraseMixin)
-from trytond.tests.test_tryton import (
-    ModuleTestCase, doctest_checker, doctest_teardown)
-
-
-class AccountPaymentTestCase(
-        PartyCompanyCheckEraseMixin, CompanyTestMixin, ModuleTestCase):
-    'Test Account Payment module'
-    module = 'account_payment'
-    extras = ['account_invoice']
-
-
-def suite():
-    suite = trytond.tests.test_tryton.suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-            AccountPaymentTestCase))
-    suite.addTests(doctest.DocFileSuite('scenario_account_payment.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    suite.addTests(doctest.DocFileSuite('scenario_account_payment_invoice.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_account_payment_direct_debit.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_account_payment_planning.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    suite.addTests(doctest.DocFileSuite(
-            'scenario_account_payment_dunning.rst',
-            tearDown=doctest_teardown, encoding='utf-8',
-            checker=doctest_checker,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    return suite
diff --git a/tests/test_module.py b/tests/test_module.py
new file mode 100644
index 0000000000..1742bbf01b
--- /dev/null
+++ b/tests/test_module.py
@@ -0,0 +1,16 @@
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+from trytond.modules.company.tests import (
+    CompanyTestMixin, PartyCompanyCheckEraseMixin)
+from trytond.tests.test_tryton import ModuleTestCase
+
+
+class AccountPaymentTestCase(
+        PartyCompanyCheckEraseMixin, CompanyTestMixin, ModuleTestCase):
+    'Test Account Payment module'
+    module = 'account_payment'
+    extras = ['account_invoice']
+
+
+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 a6319852d9..782db94f4e 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=.*/account_payment/* setup.py test
+    coverage run --include=.*/account_payment/* -m unittest discover -s tests
     coverage report --include=.*/account_payment/* --omit=*/tests/*
 deps =
     coverage