diff --git a/test/cases/000_config/group.sh b/test/cases/000_config/group.sh
deleted file mode 100644
index d9b73eb99..000000000
--- a/test/cases/000_config/group.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# SUMMARY: LinuxKit configuration tests
-# LABELS:
-# 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/000_config/000_kernel/test-kernel-config.yml b/test/cases/020_kernel/000_config/test-kernel-config.yml
similarity index 100%
rename from test/cases/000_config/000_kernel/test-kernel-config.yml
rename to test/cases/020_kernel/000_config/test-kernel-config.yml
diff --git a/test/cases/000_config/000_kernel/test.sh b/test/cases/020_kernel/000_config/test.sh
similarity index 85%
rename from test/cases/000_config/000_kernel/test.sh
rename to test/cases/020_kernel/000_config/test.sh
index 4a407455e..7883df33b 100644
--- a/test/cases/000_config/000_kernel/test.sh
+++ b/test/cases/020_kernel/000_config/test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# SUMMARY: Test the kernel configuration is suitable for running Docker
+# SUMMARY: Sanity check on the kernel config file
 # LABELS:
 # REPEAT:
 # AUTHOR: Dave Tucker <dt@docker.com>
diff --git a/test/cases/000_config/010_kmod/Dockerfile b/test/cases/020_kernel/010_kmod/Dockerfile
similarity index 100%
rename from test/cases/000_config/010_kmod/Dockerfile
rename to test/cases/020_kernel/010_kmod/Dockerfile
diff --git a/test/cases/000_config/010_kmod/check.sh b/test/cases/020_kernel/010_kmod/check.sh
similarity index 100%
rename from test/cases/000_config/010_kmod/check.sh
rename to test/cases/020_kernel/010_kmod/check.sh
diff --git a/test/cases/000_config/010_kmod/kmod.yml b/test/cases/020_kernel/010_kmod/kmod.yml
similarity index 100%
rename from test/cases/000_config/010_kmod/kmod.yml
rename to test/cases/020_kernel/010_kmod/kmod.yml
diff --git a/test/cases/000_config/010_kmod/src/Makefile b/test/cases/020_kernel/010_kmod/src/Makefile
similarity index 100%
rename from test/cases/000_config/010_kmod/src/Makefile
rename to test/cases/020_kernel/010_kmod/src/Makefile
diff --git a/test/cases/000_config/010_kmod/src/hello_world.c b/test/cases/020_kernel/010_kmod/src/hello_world.c
similarity index 100%
rename from test/cases/000_config/010_kmod/src/hello_world.c
rename to test/cases/020_kernel/010_kmod/src/hello_world.c
diff --git a/test/cases/000_config/010_kmod/test.sh b/test/cases/020_kernel/010_kmod/test.sh
similarity index 100%
rename from test/cases/000_config/010_kmod/test.sh
rename to test/cases/020_kernel/010_kmod/test.sh
diff --git a/test/cases/020_stress/group.sh b/test/cases/020_kernel/group.sh
similarity index 61%
rename from test/cases/020_stress/group.sh
rename to test/cases/020_kernel/group.sh
index 303b26465..7c0c3fd89 100644
--- a/test/cases/020_stress/group.sh
+++ b/test/cases/020_kernel/group.sh
@@ -1,12 +1,6 @@
 #!/bin/sh
-# SUMMARY: LinuxKit stress tests
+# SUMMARY: Kernel tests
 # LABELS:
-# 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
diff --git a/test/cases/020_stress/000_ltp/test-ltp.yml b/test/cases/020_stress/000_ltp/test-ltp.yml
deleted file mode 100644
index c47555f88..000000000
--- a/test/cases/020_stress/000_ltp/test-ltp.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-kernel:
-  image: "linuxkit/kernel:4.9.x"
-  cmdline: "console=ttyS0"
-init:
-  - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
-  - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d
-  - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
-  - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
-onboot:
-  - name: ltp
-    image: "linuxkit/test-ltp-20170116:81229df2d25065b06f0a3071faaace8d66c87e67"
-    net: host
-    pid: host
-    binds:
-     - /etc/ltp/baseline:/etc/ltp/baseline
-    capabilities:
-     - all
-  - name: poweroff
-    image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084"
-    pid: host
-    capabilities:
-      - CAP_SYS_BOOT
-    readonly: true
-files:
-  - path: /etc/ltp/baseline
-    contents: "100"
-outputs:
-  - format: gcp-img
diff --git a/test/cases/020_stress/000_ltp/test.sh b/test/cases/020_stress/000_ltp/test.sh
deleted file mode 100644
index 4516d75e1..000000000
--- a/test/cases/020_stress/000_ltp/test.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# SUMMARY: Run the Linux Testing Project tests 
-# LABELS: slow, gcp
-# REPEAT:
-# AUTHOR: Dave Tucker <dt@docker.com>
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-clean_up() {
-	find . -iname "test-ltp*" -not -iname "*.yml" -exec rm -rf {} \;
-}
-trap clean_up EXIT
-
-# Test code goes here
-moby build test-ltp
-linuxkit push test-ltp.img.tar.gz
-RESULT="$(linuxkit run gcp -skip-cleanup -machine n1-highcpu-4 test-ltp)"
-echo "${RESULT}" | grep -q "suite has passed"
-
-exit 0
diff --git a/test/cases/020_stress/010_virtsock/test-virtsock-server.yml b/test/cases/020_stress/010_virtsock/test-virtsock-server.yml
deleted file mode 100644
index 0f9df7e56..000000000
--- a/test/cases/020_stress/010_virtsock/test-virtsock-server.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-kernel:
-  # Alternatively:
-  #image: "linuxkit/kernel:4.11.x"
-  # image: "linuxkit/kernel:4.10.x"
-  image: "linuxkit/kernel:4.9.x"
-  # image: "linuxkit/kernel:4.4.x"
-  cmdline: "console=ttyS0 page_poison=1"
-init:
-  - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
-  - linuxkit/runc:47b1c38d63468c0f3078f8b1b055d07965a1895d
-  - linuxkit/containerd:cf2614f5a96c569a0bd4bd54e054a65ba17d167f
-  - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
-onboot:
-  - name: sysctl
-    image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
-    net: host
-    pid: host
-    ipc: host
-    capabilities:
-     - CAP_SYS_ADMIN
-    readonly: true
-services:
-  - name: rngd
-    image: "linuxkit/rngd:61a07ced77a9747708223ca16a4aec621eacf518"
-    capabilities:
-     - CAP_SYS_ADMIN
-    oomScoreAdj: -800
-    readonly: true
-  - name: dhcpcd
-    image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
-    binds:
-     - /var:/var
-     - /tmp:/etc
-    capabilities:
-     - CAP_NET_ADMIN
-     - CAP_NET_BIND_SERVICE
-     - CAP_NET_RAW
-    net: host
-    oomScoreAdj: -800
-  - name: virtsock-server
-    image: "linuxkit/test-virtsock:a7dc8e477d99ea82f56eacd94579ca65985eb0b3"
-    readonly: true
-trust:
-  image:
-    - linuxkit/kernel
-    - linuxkit/rngd
-outputs:
-  - format: kernel+initrd
-  - format: iso-efi
diff --git a/test/cases/020_stress/010_virtsock/test.sh b/test/cases/020_stress/010_virtsock/test.sh
deleted file mode 100644
index f08447049..000000000
--- a/test/cases/020_stress/010_virtsock/test.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# LABELS: windows, skip
-
-# FIXME: Write this test!!!