diff --git a/Makefile b/Makefile
index b275556..4c0c74c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,35 @@
 PYMODULES := $(shell bin/ls-py-modules)
+DBMODULES := swh-storage swh-archiver swh-scheduler
 
 all:
 
 .PHONY: doc
 doc:
 	make -C doc/
 
 check: $(patsubst %,check/%,$(PYMODULES))
 distclean: $(patsubst %,distclean/%,$(PYMODULES))
 test: $(patsubst %,test/%,$(PYMODULES))
 
 check/%:
 	make -C $* check
 distclean/%:
 	make -C $* distclean
 test/%:
 	make -C $* test
 
 .PHONY: rebuild-testdata rebuild-storage-testdata
 rebuild-testdata: rebuild-storage-testdata
 rebuild-storage-testdata:
-	make -C swh-archiver/sql/ distclean filldb
-	make -C swh-storage/sql/ distclean filldb
+	for dbmodule in $(DBMODULES); do \
+		make -C $$dbmodule/sql/ distclean filldb; \
+	done
 	make -C swh-storage-testdata distclean dumpdb
 
 update:
 	make -C swh-storage-testdata distclean
 	git pull
 	mr up
 
 clean:
 	make -C doc/ clean