diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.sh b/test/cases/010_platforms/000_qemu/000_run_kernel/test.sh
index 6c1866900..ec71059c1 100644
--- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.sh
+++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.sh
@@ -11,10 +11,8 @@ set -e
 NAME=qemu-kernel
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${NAME}* || true
+	rm -rf ${NAME}-*
 }
-
 trap clean_up EXIT
 
 moby build -format kernel+initrd -name "${NAME}" test.yml
@@ -22,4 +20,5 @@ moby build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1
 linuxkit run qemu -kernel "${NAME}" | grep -q "Welcome to LinuxKit"
+
 exit 0
diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.sh b/test/cases/010_platforms/000_qemu/010_run_iso/test.sh
index 793ee8699..2803e24da 100644
--- a/test/cases/010_platforms/000_qemu/010_run_iso/test.sh
+++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.sh
@@ -11,12 +11,12 @@ set -e
 NAME=qemu-iso
 
 clean_up() {
-	rm -rf ${NAME}* || true
+	rm -rf ${NAME}*
 }
-
 trap clean_up EXIT
 
 moby build -format iso-bios -name "${NAME}" test.yml
 [ -f "${NAME}.iso" ] || exit 1
 linuxkit run qemu -iso "${NAME}.iso" | grep -q "Welcome to LinuxKit"
+
 exit 0
diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.sh b/test/cases/010_platforms/000_qemu/020_run_efi/test.sh
index 9dfa2a14f..6077ed991 100644
--- a/test/cases/010_platforms/000_qemu/020_run_efi/test.sh
+++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.sh
@@ -11,10 +11,8 @@ set -e
 NAME=qemu-efi
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${NAME}* || true
+	rm -rf ${NAME}-*
 }
-
 trap clean_up EXIT
 
 # see https://github.com/linuxkit/linuxkit/issues/1872 this is very flaky in qemu
@@ -30,4 +28,5 @@ fi
 moby build -format iso-efi -name "${NAME}" test.yml
 [ -f "${NAME}-efi.iso" ] || exit 1
 linuxkit run qemu -iso -uefi "${NAME}-efi.iso" | grep -q "Welcome to LinuxKit"
+
 exit 0
diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.sh b/test/cases/010_platforms/000_qemu/030_run_qcow/test.sh
index 3eb49d592..0de332136 100644
--- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.sh
+++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.sh
@@ -11,13 +11,12 @@ set -e
 NAME=qemu-qcow2
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${NAME}* || true
+	rm -rf ${NAME}*
 }
-
 trap clean_up EXIT
 
 moby build -format qcow2 -name "${NAME}" test.yml
 [ -f "${NAME}.qcow2" ] || exit 1
 linuxkit run qemu "${NAME}.qcow2" | grep -q "Welcome to LinuxKit"
+
 exit 0
diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.sh b/test/cases/010_platforms/000_qemu/040_run_raw/test.sh
index cd01eaf86..c9f18a310 100644
--- a/test/cases/010_platforms/000_qemu/040_run_raw/test.sh
+++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.sh
@@ -11,13 +11,12 @@ set -e
 NAME=qemu-raw
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${NAME}* || true
+	rm -rf ${NAME}*
 }
-
 trap clean_up EXIT
 
 moby build -format raw -name "${NAME}" test.yml
 [ -f "${NAME}.raw" ] || exit 1
 linuxkit run qemu "${NAME}.raw" | grep -q "Welcome to LinuxKit"
+
 exit 0
diff --git a/test/cases/010_platforms/000_qemu/100_container/test.sh b/test/cases/010_platforms/000_qemu/100_container/test.sh
index e686ead85..412c3f207 100644
--- a/test/cases/010_platforms/000_qemu/100_container/test.sh
+++ b/test/cases/010_platforms/000_qemu/100_container/test.sh
@@ -13,10 +13,8 @@ set -e
 NAME=qemu-kernel
 
 clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${NAME}* || true
+	rm -rf ${NAME}*
 }
-
 trap clean_up EXIT
 
 # check if qemu is installed locally
@@ -33,4 +31,5 @@ moby build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1
 linuxkit run qemu -containerized "${NAME}" | grep -q "Welcome to LinuxKit"
+
 exit 0
diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.sh b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.sh
index 13fb2f52a..6d72d9a0e 100644
--- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.sh
+++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.sh
@@ -3,7 +3,6 @@
 # LABELS:
 
 set -e
-set -x
 
 # Source libraries. Uncomment if needed/defined
 #. "${RT_LIB}"
@@ -12,9 +11,7 @@ set -x
 NAME=hyperkit-kernel
 
 clean_up() {
-	echo $(pwd)
-	# remove any files, containers, images etc
-	rm -rf "${NAME}"* || true
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
@@ -23,4 +20,5 @@ moby build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1
 ./test.exp
+
 exit 0
diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.sh b/test/cases/010_platforms/010_hyperkit/010_acpi/test.sh
index c4a21f494..af6823279 100644
--- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.sh
+++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.sh
@@ -3,7 +3,6 @@
 # LABELS:
 
 set -e
-set -x
 
 # Source libraries. Uncomment if needed/defined
 #. "${RT_LIB}"
@@ -12,15 +11,14 @@ set -x
 NAME=hyperkit-acpi
 
 clean_up() {
-	echo $(pwd)
-	# remove any files, containers, images etc
-	rm -rf "${NAME}"* || true
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 moby build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-kernel" ] || exit 1
 [ -f "${NAME}-initrd.img" ] || exit 1
-[ -f "${NAME}-cmdline" ]|| exit 1
+[ -f "${NAME}-cmdline" ] || exit 1
 ./test.exp
+
 exit 0