diff --git a/setup.py b/setup.py
index ad4073c57c..0e5d763d34 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]
     stock_package_shipping_ups = trytond.modules.stock_package_shipping_ups
     """,
-    test_suite='tests',
-    test_loader='trytond.test_loader:Loader',
-    tests_require=tests_require,
     )
diff --git a/tests/__init__.py b/tests/__init__.py
index dde0767997..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.stock_package_shipping_ups.tests.test_shipping_ups import \
-        suite  # noqa: E501
-except ImportError:
-    from .test_shipping_ups import suite
-
-__all__ = ['suite']
diff --git a/tests/test_module.py b/tests/test_module.py
new file mode 100644
index 0000000000..d188e0e2ae
--- /dev/null
+++ b/tests/test_module.py
@@ -0,0 +1,12 @@
+# 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.tests.test_tryton import ModuleTestCase
+
+
+class ShippingUpsTestCase(ModuleTestCase):
+    'Test Shipping Ups module'
+    module = 'stock_package_shipping_ups'
+
+
+del ModuleTestCase
diff --git a/tests/test_scenario.py b/tests/test_scenario.py
new file mode 100644
index 0000000000..d541941c69
--- /dev/null
+++ b/tests/test_scenario.py
@@ -0,0 +1,26 @@
+# 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):
+    if (os.getenv('UPS_USER_ID')
+            and os.getenv('UPS_PASSWORD')
+            and os.getenv('UPS_LICENSE')
+            and os.getenv('UPS_ACCOUNT_NUMBER')):
+        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/tests/test_shipping_ups.py b/tests/test_shipping_ups.py
deleted file mode 100644
index 5ec6d84cbb..0000000000
--- a/tests/test_shipping_ups.py
+++ /dev/null
@@ -1,30 +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 os
-import unittest
-
-from trytond.tests.test_tryton import (
-    ModuleTestCase, doctest_checker, doctest_teardown)
-from trytond.tests.test_tryton import suite as test_suite
-
-
-class ShippingUpsTestCase(ModuleTestCase):
-    'Test Shipping Ups module'
-    module = 'stock_package_shipping_ups'
-
-
-def suite():
-    suite = test_suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-            ShippingUpsTestCase))
-    if (os.getenv('UPS_USER_ID')
-            and os.getenv('UPS_PASSWORD')
-            and os.getenv('UPS_LICENSE')
-            and os.getenv('UPS_ACCOUNT_NUMBER')):
-        suite.addTests(doctest.DocFileSuite('scenario_shipping_ups.rst',
-                tearDown=doctest_teardown, encoding='utf-8',
-                optionflags=doctest.REPORT_ONLY_FIRST_FAILURE,
-                checker=doctest_checker))
-    return suite
diff --git a/tox.ini b/tox.ini
index 6dcded9925..9f8aa9bf23 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=.*/stock_package_shipping_ups/* setup.py test
+    coverage run --include=.*/stock_package_shipping_ups/* -m unittest discover -s tests
     coverage report --include=.*/stock_package_shipping_ups/* --omit=*/tests/*
 deps =
     coverage