diff --git a/CHANGELOG b/CHANGELOG
index 4a9153ed47..e86f802654 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Use unittest discover
 * Add support for Python 3.10
 * Remove support for Python 3.6
 
diff --git a/setup.py b/setup.py
index 5684d4183d..dc80ad2a69 100755
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,6 @@ if local_version:
 
 requires = ['geomet', get_require_version('trytond'), 'psycopg2 >= 2.0.14']
 
-tests_require = []
 dependency_links = []
 if minor_version % 2:
     dependency_links.append(
@@ -106,7 +105,4 @@ setup(name=name,
         },
     dependency_links=dependency_links,
     zip_safe=False,
-    test_suite='trytond.tests',
-    test_loader='trytond.test_loader:Loader',
-    tests_require=tests_require,
     )
diff --git a/tox.ini b/tox.ini
index 2250def535..4ed403bb80 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,8 @@ envlist = py37,py38,py39,py310
 
 [testenv]
 commands =
-    coverage run setup.py test
+    coverage run -m unittest discover -s trytond.tests
+    coverage run -a -m unittest discover -s trytond_gis.tests
     coverage report --include=./trytond_gis/* --omit=*/tests/*
 deps = coverage
 setenv =
diff --git a/trytond_gis/tests/__init__.py b/trytond_gis/tests/__init__.py
index 6fd6f81d41..e4e92d5356 100644
--- a/trytond_gis/tests/__init__.py
+++ b/trytond_gis/tests/__init__.py
@@ -3,10 +3,9 @@
 
 from trytond.pool import Pool
 
-from . import gis
-
 
 def register(name):
+    from . import gis
     Pool.register(
         gis.Point,
         module=name, type_='model')
diff --git a/trytond_gis/tests/test_fields.py b/trytond_gis/tests/test_fields.py
index 34a9b46f09..c2425878b6 100644
--- a/trytond_gis/tests/test_fields.py
+++ b/trytond_gis/tests/test_fields.py
@@ -98,10 +98,3 @@ class TestGeographicFields(unittest.TestCase):
         self.assertEqual(len(points), 3)
         for point in points:
             self.assertIsNotNone(point.point)
-
-
-def suite():
-    suite_ = unittest.TestSuite()
-    suite_.addTests(unittest.TestLoader().loadTestsFromTestCase(
-            TestGeographicFields))
-    return suite_