diff --git a/Makefile b/Makefile
index 6e2f43b..2a19631 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,8 @@ publish-kweb: build-kweb
 	docker push $(docker_repo)/kopano_web:latest
 
 test:
-	sudo rm -rf data/
+	docker-compose down || true
+	docker volume ls | grep "kopano-docker_" | awk '{print $2}' | xargs docker volume rm || true
 	make build-all
 	docker-compose build
 	docker-compose up