diff --git a/Makefile b/Makefile
index aa1a8d628d12f1d18ce366ed18b218e6cb8e3aa9..18cf9edb3dbcd5ea94d284925ac7475cd60efb8c 100644
--- a/Makefile
+++ b/Makefile
@@ -160,4 +160,6 @@ test:
 		--build \
 		--force-recreate \
 		--exit-code-from dashboard-test \
+		--abort-on-container-exit \
+		--remove-orphans \
 	;