diff --git a/test/cases/010_platforms/000_qemu/000_build/test.sh b/test/cases/010_platforms/000_qemu/000_build/test.sh
deleted file mode 100644
index 1b8a42ebf..000000000
--- a/test/cases/010_platforms/000_qemu/000_build/test.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# SUMMARY: Test building an image for qemu
-# LABELS: build
-# AUTHOR: Dave Tucker <dt@docker.com>
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-IMAGE_NAME=test-qemu-build
-
-clean_up() {
-	# remove any files, containers, images etc
-	find . -iname "${IMAGE_NAME}*" -not -iname "*.yml" -exec rm {} \;
-}
-
-trap clean_up EXIT
-
-# Test code goes here
-moby build -name "${IMAGE_NAME}" test.yml
-[ -f "${IMAGE_NAME}-kernel" ] || exit 1
-[ -f "${IMAGE_NAME}-initrd.img" ] || exit 1
-[ -f "${IMAGE_NAME}-cmdline" ]|| exit 1
-
-find . -iname "${IMAGE_NAME}-*" -exec cp {} "${LINUXKIT_TMPDIR}/{}" \;
-exit 0
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
new file mode 100644
index 000000000..f3f033164
--- /dev/null
+++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+# SUMMARY: Check that the kernel+initrd image boots in qemu
+# LABELS:
+# AUTHOR: Dave Tucker <dt@docker.com>
+# AUTHOR: Rolf Neugebauer <rolf.neugebauer@docker.com>
+
+set -e
+
+# Source libraries. Uncomment if needed/defined
+#. "${RT_LIB}"
+. "${RT_PROJECT_ROOT}/_lib/lib.sh"
+
+NAME=qemu-kernel
+
+clean_up() {
+	# remove any files, containers, images etc
+	rm -rf "${NAME}*" || true
+}
+
+trap clean_up EXIT
+
+moby build -name "${NAME}" test.yml
+[ -f "${NAME}-kernel" ] || exit 1
+[ -f "${NAME}-initrd.img" ] || exit 1
+[ -f "${NAME}-cmdline" ]|| exit 1
+linuxkit run qemu "${NAME}" | grep -q "Welcome to LinuxKit"
+exit 0
diff --git a/test/cases/010_platforms/000_qemu/000_build/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml
similarity index 64%
rename from test/cases/010_platforms/000_qemu/000_build/test.yml
rename to test/cases/010_platforms/000_qemu/000_run_kernel/test.yml
index f3d1a822c..6f9b52459 100644
--- a/test/cases/010_platforms/000_qemu/000_build/test.yml
+++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml
@@ -6,17 +6,6 @@ init:
   - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
   - linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed
 onboot:
-  - name: dhcpcd
-    image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
-    binds:
-     - /var:/var
-     - /tmp/etc:/etc
-    capabilities:
-     - CAP_NET_ADMIN
-     - CAP_NET_BIND_SERVICE
-     - CAP_NET_RAW
-    net: host
-    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: poweroff
     image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084"
     pid: host
diff --git a/test/cases/010_platforms/000_qemu/001_run/test.sh b/test/cases/010_platforms/000_qemu/001_run/test.sh
deleted file mode 100644
index 4857046f4..000000000
--- a/test/cases/010_platforms/000_qemu/001_run/test.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# SUMMARY: Test running an image with qemu
-# LABELS:
-# AUTHOR: Dave Tucker <dt@docker.com>
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-IMAGE_NAME=test-qemu-build
-
-clean_up() {
-	# remove any files, containers, images etc
-	rm -rf "${LINUXKIT_TMPDIR:?}/${IMAGE_NAME:?}*" || true
-}
-
-trap clean_up EXIT
-
-# Test code goes here
-[ -f "${LINUXKIT_TMPDIR}/${IMAGE_NAME}-kernel" ] || exit 1
-linuxkit run qemu "${LINUXKIT_TMPDIR}/${IMAGE_NAME}" | grep -q "Welcome to LinuxKit"
-exit 0
diff --git a/test/cases/010_platforms/000_qemu/010_build_iso/test.sh b/test/cases/010_platforms/000_qemu/010_build_iso/test.sh
deleted file mode 100644
index 8e7f0289b..000000000
--- a/test/cases/010_platforms/000_qemu/010_build_iso/test.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# SUMMARY: Test building an ISO image for qemu
-# LABELS: build
-# AUTHOR: Dave Tucker <dt@docker.com>
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-IMAGE_NAME=test-qemu-build
-
-clean_up() {
-	# remove any files, containers, images etc
-	find . -iname "${IMAGE_NAME}*" -not -iname "*.yml" -exec rm {} \;
-}
-
-trap clean_up EXIT
-
-# Test code goes here
-moby build -name "${IMAGE_NAME}" test.yml
-[ -f "${IMAGE_NAME}.iso" ] || exit 1
-
-cp "${IMAGE_NAME}.iso" "${LINUXKIT_TMPDIR}/"
-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
new file mode 100644
index 000000000..dae34b3d1
--- /dev/null
+++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+# SUMMARY: Check that legacy BIOS ISO boots in qemu
+# LABELS:
+# AUTHOR: Dave Tucker <dt@docker.com>
+# AUTHOR: Rolf Neugebauer <rolf.neugebauer@docker.com>
+
+set -e
+
+# Source libraries. Uncomment if needed/defined
+#. "${RT_LIB}"
+. "${RT_PROJECT_ROOT}/_lib/lib.sh"
+
+NAME=qemu-iso
+
+clean_up() {
+	rm -rf "${NAME}*" || true
+}
+
+trap clean_up EXIT
+
+moby build -name "${NAME}" test.yml
+[ -f "${NAME}.iso" ] || exit 1
+linuxkit run qemu -iso "${NAME}" | grep -q "Welcome to LinuxKit"
+exit 0
diff --git a/test/cases/010_platforms/000_qemu/010_build_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml
similarity index 64%
rename from test/cases/010_platforms/000_qemu/010_build_iso/test.yml
rename to test/cases/010_platforms/000_qemu/010_run_iso/test.yml
index 6bb6bdf4f..87c762462 100644
--- a/test/cases/010_platforms/000_qemu/010_build_iso/test.yml
+++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml
@@ -6,17 +6,6 @@ init:
   - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
   - linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed
 onboot:
-  - name: dhcpcd
-    image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
-    binds:
-     - /var:/var
-     - /tmp/etc:/etc
-    capabilities:
-     - CAP_NET_ADMIN
-     - CAP_NET_BIND_SERVICE
-     - CAP_NET_RAW
-    net: host
-    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: poweroff
     image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084"
     pid: host
diff --git a/test/cases/010_platforms/000_qemu/011_run_iso/test.sh b/test/cases/010_platforms/000_qemu/011_run_iso/test.sh
deleted file mode 100644
index 571a47827..000000000
--- a/test/cases/010_platforms/000_qemu/011_run_iso/test.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# SUMMARY: Test running an ISO image with qemu
-# LABELS:
-# AUTHOR: Dave Tucker <dt@docker.com>
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-IMAGE_NAME=test-qemu-build
-
-clean_up() {
-	# remove any files, containers, images etc
-	rm -rf "${LINUXKIT_TMPDIR:?}/${IMAGE_NAME:?}*" || true
-}
-
-trap clean_up EXIT
-
-# Test code goes here
-[ -f "${LINUXKIT_TMPDIR}/${IMAGE_NAME}.iso" ] || exit 1
-linuxkit run qemu -iso "${LINUXKIT_TMPDIR}/${IMAGE_NAME}" | grep -q "Welcome to LinuxKit"
-exit 0
diff --git a/test/cases/010_platforms/000_qemu/020_build_efi/test.sh b/test/cases/010_platforms/000_qemu/020_build_efi/test.sh
deleted file mode 100644
index 763090372..000000000
--- a/test/cases/010_platforms/000_qemu/020_build_efi/test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# SUMMARY: Test building a UEFI image for qemu
-# LABELS: build
-# AUTHOR: Dave Tucker <dt@docker.com>
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-IMAGE_NAME=test-qemu-build
-
-clean_up() {
-	# remove any files, containers, images etc
-	find . -iname "${IMAGE_NAME}*" -not -iname "*.yml" -exec rm {} \;
-}
-
-trap clean_up EXIT
-
-# Test code goes here
-moby build -name "${IMAGE_NAME}" test.yml
-[ -f "${IMAGE_NAME}-efi.iso" ] || exit 1
-cp "${IMAGE_NAME}-efi.iso" "${LINUXKIT_TMPDIR}/"
-exit 0
diff --git a/test/cases/010_platforms/000_qemu/021_run_efi/test.sh b/test/cases/010_platforms/000_qemu/020_run_efi/test.sh
similarity index 53%
rename from test/cases/010_platforms/000_qemu/021_run_efi/test.sh
rename to test/cases/010_platforms/000_qemu/020_run_efi/test.sh
index 6b02ce3e4..4bef989cd 100644
--- a/test/cases/010_platforms/000_qemu/021_run_efi/test.sh
+++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
-# SUMMARY: Test running a UEFI image with qemu
+# SUMMARY: Check that legacy BIOS ISO boots in qemu
 # LABELS:
 # AUTHOR: Dave Tucker <dt@docker.com>
+# AUTHOR: Rolf Neugebauer <rolf.neugebauer@docker.com>
 
 set -e
 
@@ -9,11 +10,11 @@ set -e
 #. "${RT_LIB}"
 . "${RT_PROJECT_ROOT}/_lib/lib.sh"
 
-IMAGE_NAME=test-qemu-build
+NAME=qemu-efi
 
 clean_up() {
 	# remove any files, containers, images etc
-	rm -rf "${LINUXKIT_TMPDIR:?}/${IMAGE_NAME:?}*" || true
+	rm -rf "${NAME}*" || true
 }
 
 trap clean_up EXIT
@@ -24,8 +25,7 @@ if command -v qemu; then
 	fi
 fi
 
-
-# Test code goes here
-[ -f "${LINUXKIT_TMPDIR}/${IMAGE_NAME}-efi.iso" ] || exit 1
-linuxkit run qemu -uefi "${LINUXKIT_TMPDIR}/${IMAGE_NAME}" | grep -q "Welcome to LinuxKit"
+moby build -name "${NAME}" test.yml
+[ -f "${NAME}-efi.iso" ] || exit 1
+linuxkit run qemu -uefi "${NAME}" | grep -q "Welcome to LinuxKit"
 exit 0
diff --git a/test/cases/010_platforms/000_qemu/020_build_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml
similarity index 64%
rename from test/cases/010_platforms/000_qemu/020_build_efi/test.yml
rename to test/cases/010_platforms/000_qemu/020_run_efi/test.yml
index 5e6aecb10..8153330ba 100644
--- a/test/cases/010_platforms/000_qemu/020_build_efi/test.yml
+++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml
@@ -6,17 +6,6 @@ init:
   - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
   - linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed
 onboot:
-  - name: dhcpcd
-    image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
-    binds:
-     - /var:/var
-     - /tmp/etc:/etc
-    capabilities:
-     - CAP_NET_ADMIN
-     - CAP_NET_BIND_SERVICE
-     - CAP_NET_RAW
-    net: host
-    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: poweroff
     image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084"
     pid: host
diff --git a/test/cases/010_platforms/010_gcp/000_build/test.sh b/test/cases/010_platforms/010_gcp/000_build/test.sh
deleted file mode 100644
index 9f847a26c..000000000
--- a/test/cases/010_platforms/010_gcp/000_build/test.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# SUMMARY: Test building an image for GCP
-# LABELS: build
-# AUTHOR: Dave Tucker <dt@docker.com>
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-IMAGE_NAME=gcp
-
-clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
-}
-
-trap clean_up EXIT
-
-# Test code goes here
-moby build -name "${IMAGE_NAME}" test.yml
-[ -f "${IMAGE_NAME}.img.tar.gz" ] || exit 1
-# As build and run on different machines, copy to the artifacts directory
-cp -f "${IMAGE_NAME}.img.tar.gz" "${LINUXKIT_ARTIFACTS_DIR}/test.img.tar.gz"
-
-exit 0
diff --git a/test/cases/010_platforms/010_gcp/000_build/test.yml b/test/cases/010_platforms/010_gcp/000_build/test.yml
deleted file mode 100644
index f807e78f4..000000000
--- a/test/cases/010_platforms/010_gcp/000_build/test.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# FIXME: This should use the minimal example
-# We continue to use the kernel-config-test as CI is currently expecting to see a success message
-kernel:
-  image: "linuxkit/kernel:4.9.x"
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f
-  - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
-  - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
-  - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
-onboot:
-  - name: dhcpcd
-    image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
-    binds:
-     - /var:/var
-     - /tmp:/etc
-    capabilities:
-     - CAP_NET_ADMIN
-     - CAP_NET_BIND_SERVICE
-     - CAP_NET_RAW
-    net: host
-    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
-  - name: check-kernel-config
-    image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c"
-    readonly: true
-  - name: poweroff
-    image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084"
-    pid: host
-    command: ["/bin/sh", "/poweroff.sh", "3"]
-    capabilities:
-     - CAP_SYS_BOOT
-    readonly: true
-outputs:
-    - format: gcp-img
diff --git a/test/cases/010_platforms/010_gcp/001_run/test.sh b/test/cases/010_platforms/010_gcp/001_run/test.sh
deleted file mode 100644
index 5779c0aee..000000000
--- a/test/cases/010_platforms/010_gcp/001_run/test.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# SUMMARY: Test running an image with qemu
-# LABELS: gcp
-# AUTHOR: Dave Tucker <dt@docker.com>
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-IMAGE_NAME=test
-
-clean_up() {
-	# remove any files, containers, images etc
-	echo "Nothing to cleanup..."
-}
-
-trap clean_up EXIT
-
-# Test code goes here
-[ -f "${LINUXKIT_ARTIFACTS_DIR}/${IMAGE_NAME}.img.tar.gz" ] || exit 1
-linuxkit run gcp "${LINUXKIT_ARTIFACTS_DIR}/${IMAGE_NAME}" | grep -q "Welcome to LinuxKit"
-exit 0
diff --git a/test/cases/010_platforms/001_hyperkit/group.sh b/test/cases/010_platforms/010_hyperkit/group.sh
similarity index 100%
rename from test/cases/010_platforms/001_hyperkit/group.sh
rename to test/cases/010_platforms/010_hyperkit/group.sh
diff --git a/test/cases/010_platforms/020_packet/000_build/test.sh b/test/cases/010_platforms/020_packet/000_build/test.sh
deleted file mode 100644
index 0fd2c1018..000000000
--- a/test/cases/010_platforms/020_packet/000_build/test.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# SUMMARY: Test building an image for packet.net
-# LABELS: build
-# AUTHOR: Dave Tucker <dt@docker.com>
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-IMAGE_NAME=packet
-
-clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
-}
-
-trap clean_up EXIT
-
-# Test code goes here
-moby build --name "${IMAGE_NAME}" test.yml 
-[ -f "${IMAGE_NAME}-kernel" ] || exit 1
-
-# As build and run on different machines, copy to the artifacts directory
-find . -iname "${IMAGE_NAME}-*" -exec cp {} "${LINUXKIT_ARTFACTS_DIR}/{}" \;
-exit 0
diff --git a/test/cases/010_platforms/020_packet/000_build/test.yml b/test/cases/010_platforms/020_packet/000_build/test.yml
deleted file mode 100644
index f3d1a822c..000000000
--- a/test/cases/010_platforms/020_packet/000_build/test.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-kernel:
-  image: "linuxkit/kernel:4.9.x"
-  cmdline: "console=ttyS0 console=tty0 page_poison=1"
-init:
-  - linuxkit/init:f71c3b30ac1ba4ef16c160c89610fa4976f9752f
-  - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
-  - linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed
-onboot:
-  - name: dhcpcd
-    image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
-    binds:
-     - /var:/var
-     - /tmp/etc:/etc
-    capabilities:
-     - CAP_NET_ADMIN
-     - CAP_NET_BIND_SERVICE
-     - CAP_NET_RAW
-    net: host
-    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
-  - name: poweroff
-    image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084"
-    pid: host
-    command: ["/bin/sh", "/poweroff.sh", "10"]
-    capabilities:
-     - CAP_SYS_BOOT
-    readonly: true
-trust:
-  image:
-    - linuxkit/kernel
-outputs:
-  - format: kernel+initrd
diff --git a/test/cases/010_platforms/020_vmware/group.sh b/test/cases/010_platforms/020_vmware/group.sh
new file mode 100644
index 000000000..47ce7b26e
--- /dev/null
+++ b/test/cases/010_platforms/020_vmware/group.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# SUMMARY: LinuxKit VMware tests
+# LABELS: darwin
+# For the top level group.sh also specify a 'NAME:' comment
+
+# Source libraries. Uncomment if needed/defined
+#. "${RT_LIB}"
+#. "${RT_PROJECT_ROOT}/_lib/lib.sh"
+
+
+group_init() {
+    # Group initialisation code goes here
+    return 0
+}
+
+group_deinit() {
+    # Group de-initialisation code goes here
+    return 0
+}
+
+CMD=$1
+case $CMD in
+init)
+    group_init
+    res=$?
+    ;;
+deinit)
+    group_deinit
+    res=$?
+    ;;
+*)
+    res=1
+    ;;
+esac
+
+exit $res
+
diff --git a/test/cases/010_platforms/030_vmware/000_build/test.sh b/test/cases/010_platforms/030_vmware/000_build/test.sh
deleted file mode 100644
index c3c66d854..000000000
--- a/test/cases/010_platforms/030_vmware/000_build/test.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# SUMMARY: Test building an image for VMware
-# LABELS: build
-# AUTHOR: Dave Tucker <dt@docker.com>
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-IMAGE_NAME=vmware
-
-clean_up() {
-	# remove any files, containers, images etc
-	rm -rf ${IMAGE_NAME}*
-}
-
-trap clean_up EXIT
-
-# Test code goes here
-moby build --name "${IMAGE_NAME}" test.yml 
-[ -f "${IMAGE_NAME}.vmdk" ] || exit 1
-# As build and run on different machines, copy to the artifacts directory
-cp "${IMAGE_NAME}.vmdk" "${LINUXKIT_ARTIFACTS_DIR}/"
-exit 0
-
diff --git a/test/cases/010_platforms/030_vmware/000_build/test.yml b/test/cases/010_platforms/030_vmware/000_build/test.yml
deleted file mode 100644
index 008a49ddb..000000000
--- a/test/cases/010_platforms/030_vmware/000_build/test.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-kernel:
-  image: "linuxkit/kernel:4.9.x"
-  cmdline: "console=ttyS0 console=tty0 page_poison=1"
-init:
-  - linuxkit/init:f71c3b30ac1ba4ef16c160c89610fa4976f9752f
-  - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
-  - linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed
-onboot:
-  - name: dhcpcd
-    image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
-    binds:
-     - /var:/var
-     - /tmp/etc:/etc
-    capabilities:
-     - CAP_NET_ADMIN
-     - CAP_NET_BIND_SERVICE
-     - CAP_NET_RAW
-    net: host
-    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
-  - name: poweroff
-    image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084"
-    pid: host
-    command: ["/bin/sh", "/poweroff.sh", "10"]
-    capabilities:
-     - CAP_SYS_BOOT
-    readonly: true
-trust:
-  image:
-    - linuxkit/kernel
-outputs:
-  - format: vmdk 
diff --git a/test/cases/010_platforms/020_packet/group.sh b/test/cases/010_platforms/100_packet/group.sh
similarity index 92%
rename from test/cases/010_platforms/020_packet/group.sh
rename to test/cases/010_platforms/100_packet/group.sh
index d9b73eb99..8270c115e 100644
--- a/test/cases/010_platforms/020_packet/group.sh
+++ b/test/cases/010_platforms/100_packet/group.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# SUMMARY: LinuxKit configuration tests
+# SUMMARY: LinuxKit packet.net tests
 # LABELS:
 # For the top level group.sh also specify a 'NAME:' comment
 
diff --git a/test/cases/010_platforms/010_gcp/group.sh b/test/cases/010_platforms/110_gcp/group.sh
similarity index 92%
rename from test/cases/010_platforms/010_gcp/group.sh
rename to test/cases/010_platforms/110_gcp/group.sh
index d9b73eb99..0b90c45f3 100644
--- a/test/cases/010_platforms/010_gcp/group.sh
+++ b/test/cases/010_platforms/110_gcp/group.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# SUMMARY: LinuxKit configuration tests
+# SUMMARY: LinuxKit Google Cloud tests
 # LABELS:
 # For the top level group.sh also specify a 'NAME:' comment