diff --git a/test/test-functions b/test/test-functions
index 3f5d8df966..d2c75f51ae 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -675,7 +675,7 @@ cleanup_loopdev() {
     fi
 }
 
-trap cleanup_loopdev EXIT
+trap cleanup_loopdev EXIT INT QUIT PIPE
 
 create_empty_image() {
     if [ -z "$IMAGE_NAME" ]; then