hotosm · prabinoid · Jun 19, 2026
diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ test-frontend:
 	docker-compose exec frontend sh -c "cd /usr/src/app/frontend && CI=true npm test"
 
 test-backend:
-	docker-compose exec backend sh -c "python -m unittest discover tests/backend"
+	docker-compose exec tm-backend sh -c "pytest tests/api -p no:warnings"
 
 fetch:
 ifndef PRNUMBER

diff --git a/docs/developers/development-setup.md b/docs/developers/development-setup.md
@@ -281,7 +281,7 @@ The project includes a suite of Unit and Integration tests that you
 should run after any changes.
 
 ```
-python3 -m unittest discover tests/backend
+pytest tests/api
 ```
 or
 ```

diff --git a/docs/developers/submit-pr.md b/docs/developers/submit-pr.md
@@ -17,11 +17,11 @@ mode for more than a short time runs the risk of being ignored.
 The backend has unit tests which can be run manually. These are the
 same tests the CI support runs. To run all the tests, do this:
 
-	python3 -m unittest discover ./tests
+	pytest tests/api
 
 To run a specific test case, you can do it like this:
 
-	python -m unittest tests/backend/integration/services/test_license_service.py
+	pytest tests/api/integration/services/test_license_service.py
 
 Whenever you add a new endpoint in the backend, you should add a test
 case for it.

diff --git a/tests/api/integration/services/test_project_search_service.py b/tests/api/integration/services/test_project_search_service.py
@@ -5,7 +5,7 @@
 from backend.models.postgis.project import ProjectInfo, Project
 from backend.models.dtos.project_dto import ProjectSearchBBoxDTO
 from backend.models.postgis.user import User
-from tests.backend.helpers.test_helpers import get_canned_json
+from tests.api.helpers.test_helpers import get_canned_json
 from unittest.mock import patch, MagicMock, AsyncMock
 from shapely.geometry import Polygon, box
 import shapely.wkt

diff --git a/tests/api/unit/services/users/test_osm_service.py b/tests/api/unit/services/users/test_osm_service.py
@@ -1,6 +1,6 @@
 import pytest
 from backend.services.users.osm_service import OSMService, OSMServiceError
-from tests.backend.helpers.test_helpers import get_canned_osm_user_json_details
+from tests.api.helpers.test_helpers import get_canned_osm_user_json_details
 
 
 class TestOsmService:

diff --git a/tests/backend/__init__.py b/tests/backend/__init__.py
diff --git a/tests/backend/base.py b/tests/backend/base.py
diff --git a/tests/backend/helpers/__init__.py b/tests/backend/helpers/__init__.py
diff --git a/tests/backend/helpers/test_files/2d_multi_polygon.json b/tests/backend/helpers/test_files/2d_multi_polygon.json
diff --git a/tests/backend/helpers/test_files/CHAI-Escuintla-West2.json b/tests/backend/helpers/test_files/CHAI-Escuintla-West2.json
diff --git a/tests/backend/helpers/test_files/canned_draft_project.json b/tests/backend/helpers/test_files/canned_draft_project.json
diff --git a/tests/backend/helpers/test_files/canned_kml_project.json b/tests/backend/helpers/test_files/canned_kml_project.json
-Original file line number
+Diff line change
@@ Expand Up @@
     should run after any changes.
     ```
-    python3 -m unittest discover tests/backend
+    pytest tests/api
     ```
     or
     ```
@@ Expand Down @@