diff --git a/Makefile.local b/Makefile.local
index 9a188c9..f1c93e5 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,95 +1,98 @@
 # -*- makefile -*-
 
 FLAKE = flake8
 BINDIR = bin
 SRCDIR = swh
 REPO_PATH=./swh-loader-git-testdata
 
 # add -v for example
 FLAG=
 
 TESTDIR = ./swh/tests
 
 DB=softwareheritage-dev
 DB_TEST=$(DB)-test
 
 SWH_LOADER=$(BINDIR)/swh-git-loader
 SWH_DB_MANAGER=$(BINDIR)/swh-db-manager
 SWH_BACK=$(BINDIR)/swh-backend
 
 SQL_FOLDER=../swh-storage/sql/
 
 # could use cProfile
 PROFILE_TYPE=profile
 
 FOLLOW_LOG=-f
 
 # Adapt python-path to use other swh modules
 _PYPATH=`pwd`:`pwd`/../swh-core:`pwd`/../swh-storage
 
 deps:
 	apt-get install -y \
 		python3 \
 		python3-pygit2 \
 		python3-psycopg2 \
 		python3-nose \
 		python3-flask \
 		python3-requests \
 		python3-retrying \
 		ipython3
 
 cover:
 	PYTHONPATH=$(_PYPATH) make coverage
 
 clean:
-	rm -rf /tmp/swh-git-loader/content-storage
+	rm -rf /tmp/swh-git-loader/content-storage /tmp/swh-git-loader/test/
+
+prepare:
+	mkdir -p /tmp/swh-git-loader/content-storage /tmp/swh-git-loader/test/
 
 cleandb: clean
 	PYTHONPATH=$(_PYPATH) $(SWH_DB_MANAGER) $(FLAG) cleandb
 
 run-remote:
 	PYTHONPATH=$(_PYPATH) $(SWH_LOADER) $(FLAG) --config ./resources/remote-git-loader.ini load $(REPO_PATH)
 
 run-local:
 	PYTHONPATH=$(_PYPATH) $(SWH_LOADER) $(FLAG) --config ./resources/local-git-loader.ini load $(REPO_PATH)
 
 run:
 	# works with the default ~/.config/swh/git-loader.ini file
 	PYTHONPATH=$(_PYPATH) $(SWH_LOADER) $(FLAG) load $(REPO_PATH)
 
 run-back:
 	PYTHONPATH=$(_PYPATH) $(SWH_BACK) $(FLAG)
 
 connect-db:
 	psql -d $(DB)
 
 create-db:
 	cd $(SQL_FOLDER) && make clean initdb
 
 drop-db:
 	cd $(SQL_FOLDER) && make clean dropdb
 
 check-meta:
 	@echo "Repository: $(REPO_PATH)"
 
 	@echo "Git metadata:"
 	@$(BINDIR)/dir-git-repo-meta.sh $(REPO_PATH)
 	@echo
 
 	@echo "DB metadata:"
 	@$(BINDIR)/db-git-repo-meta.sh $(DB) $(REPO_PATH)
 	@echo
 
 log-loader:
 	tail $(FOLLOW_LOG) /tmp/swh-git-loader/log/sgloader.log
 
 log-back:
 	tail $(FOLLOW_LOG) /tmp/swh-git-loader/log/back.log
 
 profile-run:
 	PYTHONPATH=$(_PYPATH) python3 -m $(PROFILE_TYPE) -o ./scratch/swhgitloader.$(PROFILE_TYPE) ./scratch/profile-swhgitloader.py
 
 profile-stats:
 	PYTHONPATH=$(_PYPATH) ./scratch/analyse-profile.py
 
 include Makefile.tests