diff --git a/Makefile b/Makefile
index 961b2b6ab7..5618ce6259 100644
--- a/Makefile
+++ b/Makefile
@@ -73,12 +73,12 @@ docker-push-pipeline:
 docker-build-forklift:
 	docker build -f "infra/docker/Dockerfile.Forklift" . -t forklift:$(VERSION)
 docker-run-data-warehouse:
-	git clone --depth=1 --branch=master https://github.com/MTES-MCT/monitorfish.git ./data_warehouse/tests/test_data/external/monitorfish && \
+	git clone --depth=1 --branch=master https://github.com/MTES-MCT/monitorfish.git ./data_warehouse/tests/test_data/external/monitorfish || echo "Monitorfish repository already present - skipping git clone" && \
 	export DATA_WAREHOUSE_PASSWORD=password && \
 	export DATA_WAREHOUSE_USER=clickhouse_user && \
 	docker compose -f ./infra/data_warehouse/docker-compose.yml -f ./infra/data_warehouse/docker-compose-test-data.yml up -d --remove-orphans
 docker-test-forklift: docker-run-data-warehouse
-	docker run --network host -v /var/run/docker.sock:/var/run/docker.sock -u forklift:$(DOCKER_GROUP) --env-file data_warehouse/.env.test forklift:$(VERSION) coverage run -m pytest --pdb tests
+	docker run --network host -v /var/run/docker.sock:/var/run/docker.sock -u forklift:$(DOCKER_GROUP) --env-file data_warehouse/.env.test forklift:$(VERSION) coverage run -m pytest --pdb --ignore=tests/test_data/external tests
 docker-tag-forklift:
 	docker tag forklift:$(VERSION) ghcr.io/mtes-mct/monitorfish/forklift:$(VERSION)
 docker-push-forklift: