diff --git a/test/cases/020_kernel/000_config_4.4.x/test.sh b/test/cases/020_kernel/000_config_4.4.x/test.sh
index 1d3926a50..ec2bd3ed2 100644
--- a/test/cases/020_kernel/000_config_4.4.x/test.sh
+++ b/test/cases/020_kernel/000_config_4.4.x/test.sh
@@ -9,14 +9,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=kconfig
+
 clean_up() {
-	find . -depth -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd test-kernel-config.yml
-RESULT="$(linuxkit run test-kernel-config)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0
diff --git a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml
similarity index 100%
rename from test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml
rename to test/cases/020_kernel/000_config_4.4.x/test.yml
diff --git a/test/cases/020_kernel/001_config_4.9.x/test.sh b/test/cases/020_kernel/001_config_4.9.x/test.sh
index 1d3926a50..ec2bd3ed2 100644
--- a/test/cases/020_kernel/001_config_4.9.x/test.sh
+++ b/test/cases/020_kernel/001_config_4.9.x/test.sh
@@ -9,14 +9,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=kconfig
+
 clean_up() {
-	find . -depth -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd test-kernel-config.yml
-RESULT="$(linuxkit run test-kernel-config)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0
diff --git a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml
similarity index 100%
rename from test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml
rename to test/cases/020_kernel/001_config_4.9.x/test.yml
diff --git a/test/cases/020_kernel/004_config_4.12.x/test.sh b/test/cases/020_kernel/004_config_4.12.x/test.sh
index 1d3926a50..ec2bd3ed2 100644
--- a/test/cases/020_kernel/004_config_4.12.x/test.sh
+++ b/test/cases/020_kernel/004_config_4.12.x/test.sh
@@ -9,14 +9,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=kconfig
+
 clean_up() {
-	find . -depth -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd test-kernel-config.yml
-RESULT="$(linuxkit run test-kernel-config)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0
diff --git a/test/cases/020_kernel/004_config_4.12.x/test-kernel-config.yml b/test/cases/020_kernel/004_config_4.12.x/test.yml
similarity index 100%
rename from test/cases/020_kernel/004_config_4.12.x/test-kernel-config.yml
rename to test/cases/020_kernel/004_config_4.12.x/test.yml
diff --git a/test/cases/020_kernel/010_kmod_4.9.x/test.sh b/test/cases/020_kernel/010_kmod_4.9.x/test.sh
index 493fc40b6..22d4dfc65 100644
--- a/test/cases/020_kernel/010_kmod_4.9.x/test.sh
+++ b/test/cases/020_kernel/010_kmod_4.9.x/test.sh
@@ -9,11 +9,12 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME="kmod-test"
+NAME=kmod
+IMAGE_NAME=kmod-test
 
 clean_up() {
 	docker rmi ${IMAGE_NAME} || true
-	find . -depth -iname "kmod*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
@@ -23,8 +24,8 @@ docker pull linuxkit/kernel:4.9.50
 docker build -t ${IMAGE_NAME} .
 
 # Build and run a LinuxKit image with kernel module (and test script)
-moby build -format kernel+initrd kmod.yml
-RESULT="$(linuxkit run kmod)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}" | grep -q "Hello LinuxKit"
 
 exit 0
diff --git a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml b/test/cases/020_kernel/010_kmod_4.9.x/test.yml
similarity index 100%
rename from test/cases/020_kernel/010_kmod_4.9.x/kmod.yml
rename to test/cases/020_kernel/010_kmod_4.9.x/test.yml
diff --git a/test/cases/030_security/000_docker-bench/test-docker-bench.yml b/test/cases/030_security/000_docker-bench/test.yml
similarity index 100%
rename from test/cases/030_security/000_docker-bench/test-docker-bench.yml
rename to test/cases/030_security/000_docker-bench/test.yml
diff --git a/test/cases/040_packages/002_binfmt/test.sh b/test/cases/040_packages/002_binfmt/test.sh
index f0f2bc926..d31df4406 100644
--- a/test/cases/040_packages/002_binfmt/test.sh
+++ b/test/cases/040_packages/002_binfmt/test.sh
@@ -8,15 +8,16 @@ set -e
 # Source libraries. Uncomment if needed/defined
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
+NAME=binfmt
 
 clean_up() {
-	find . -depth -iname "test-binfmt*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd test-binfmt.yml
-RESULT="$(linuxkit run test-binfmt)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test.yml
similarity index 100%
rename from test/cases/040_packages/002_binfmt/test-binfmt.yml
rename to test/cases/040_packages/002_binfmt/test.yml
diff --git a/test/cases/040_packages/003_ca-certificates/test.sh b/test/cases/040_packages/003_ca-certificates/test.sh
index 9674199a0..ea6554f03 100644
--- a/test/cases/040_packages/003_ca-certificates/test.sh
+++ b/test/cases/040_packages/003_ca-certificates/test.sh
@@ -8,15 +8,16 @@ set -e
 # Source libraries. Uncomment if needed/defined
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
+NAME=ca-certificates
 
 clean_up() {
-	find . -depth -iname "test-ca-certificates*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd test-ca-certificates.yml
-RESULT="$(linuxkit run test-ca-certificates)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run $NAME)"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml b/test/cases/040_packages/003_ca-certificates/test.yml
similarity index 100%
rename from test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml
rename to test/cases/040_packages/003_ca-certificates/test.yml
diff --git a/test/cases/040_packages/003_containerd/test.sh b/test/cases/040_packages/003_containerd/test.sh
index c1eb289a1..352616b28 100644
--- a/test/cases/040_packages/003_containerd/test.sh
+++ b/test/cases/040_packages/003_containerd/test.sh
@@ -9,14 +9,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=containerd
+
 clean_up() {
-	find . -depth -iname "test-containerd*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 # Test code goes here
-moby build test-containerd.yml
-RESULT="$(linuxkit run -mem 2048 -disk size=2G test-containerd)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run -mem 2048 -disk size=2G ${NAME})"
 echo "${RESULT}" | grep -q "suite PASSED"
 
 exit 0
diff --git a/test/cases/040_packages/003_containerd/test-containerd.yml b/test/cases/040_packages/003_containerd/test.yml
similarity index 100%
rename from test/cases/040_packages/003_containerd/test-containerd.yml
rename to test/cases/040_packages/003_containerd/test.yml
diff --git a/test/cases/040_packages/004_dhcpcd/test.sh b/test/cases/040_packages/004_dhcpcd/test.sh
index 1efae049f..978112a52 100644
--- a/test/cases/040_packages/004_dhcpcd/test.sh
+++ b/test/cases/040_packages/004_dhcpcd/test.sh
@@ -9,14 +9,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=dhcpcd
+
 clean_up() {
-	find . -depth -iname "test-dhcpcd*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd test-dhcpcd.yml
-RESULT="$(linuxkit run test-dhcpcd)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run $NAME)"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test.yml
similarity index 100%
rename from test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml
rename to test/cases/040_packages/004_dhcpcd/test.yml
diff --git a/test/cases/040_packages/007_getty-containerd/test.sh b/test/cases/040_packages/007_getty-containerd/test.sh
index 2e9b420cb..8b59f0c26 100755
--- a/test/cases/040_packages/007_getty-containerd/test.sh
+++ b/test/cases/040_packages/007_getty-containerd/test.sh
@@ -12,11 +12,11 @@ set -e
 NAME=test-ctr
 
 clean_up() {
-	find . -depth -iname "test-ctr*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
-moby build "${NAME}.yml"
+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
diff --git a/test/cases/040_packages/007_getty-containerd/test-ctr.yml b/test/cases/040_packages/007_getty-containerd/test.yml
similarity index 100%
rename from test/cases/040_packages/007_getty-containerd/test-ctr.yml
rename to test/cases/040_packages/007_getty-containerd/test.yml
diff --git a/test/cases/040_packages/019_sysctl/test.sh b/test/cases/040_packages/019_sysctl/test.sh
index 41ad8e641..8f2169c88 100644
--- a/test/cases/040_packages/019_sysctl/test.sh
+++ b/test/cases/040_packages/019_sysctl/test.sh
@@ -9,14 +9,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=sysctl
+
 clean_up() {
-	find . -depth -iname "test-sysctl*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd test-sysctl.yml
-RESULT="$(linuxkit run test-sysctl)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/040_packages/019_sysctl/test-sysctl.yml b/test/cases/040_packages/019_sysctl/test.yml
similarity index 100%
rename from test/cases/040_packages/019_sysctl/test-sysctl.yml
rename to test/cases/040_packages/019_sysctl/test.yml
diff --git a/test/cases/040_packages/023_wireguard/test.sh b/test/cases/040_packages/023_wireguard/test.sh
index d0f048813..9976f7b46 100644
--- a/test/cases/040_packages/023_wireguard/test.sh
+++ b/test/cases/040_packages/023_wireguard/test.sh
@@ -9,14 +9,16 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
+NAME=wireguard
+
 clean_up() {
-	find . -depth -iname "test-wireguard*" -not -iname "*.yml" -exec rm -rf {} \;
+	rm -rf ${NAME}-*
 }
 trap clean_up EXIT
 
 # Test code goes here
-moby build -format kernel+initrd test-wireguard.yml
-RESULT="$(linuxkit run test-wireguard)"
+moby build -format kernel+initrd -name "${NAME}" test.yml
+RESULT="$(linuxkit run ${NAME})"
 echo "${RESULT}"
 echo "${RESULT}" | grep -q "suite PASSED"
 
diff --git a/test/cases/040_packages/023_wireguard/test-wireguard.yml b/test/cases/040_packages/023_wireguard/test.yml
similarity index 100%
rename from test/cases/040_packages/023_wireguard/test-wireguard.yml
rename to test/cases/040_packages/023_wireguard/test.yml