From 0f4cad6a5cf8b49882805381d7e655fd4a7dc75a Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@gmail.com>
Date: Wed, 4 Apr 2018 19:35:39 +0100
Subject: [PATCH 1/2] tests: Remove namespace tests for 4.4.x and 4.9.x kernels

We do not run these tests as part of CI and when running them
manually it is easy to just change the kernel image common.yml.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
---
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../017_echo-tcp-ipv4-long-5con-multi/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../027_echo-tcp-ipv6-long-5con-multi/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../037_echo-udp-ipv4-long-5con-multi/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../047_echo-udp-ipv6-long-5con-multi/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../000_kernel-4.4.x/010_veth/group.sh        | 31 -------------------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../010_echo-short-1con-single/test.sh        | 23 --------------
 .../010_echo-short-1con-single/test.yml       | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../011_echo-short-10con-single/test.sh       | 23 --------------
 .../011_echo-short-10con-single/test.yml      | 10 ------
 .../012_echo-short-5con-multi-reverse/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../012_echo-short-5con-multi/test.sh         | 23 --------------
 .../012_echo-short-5con-multi/test.yml        | 10 ------
 .../015_echo-long-1con-single-reverse/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../015_echo-long-1con-single/test.sh         | 23 --------------
 .../015_echo-long-1con-single/test.yml        | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../016_echo-long-10con-single/test.sh        | 23 --------------
 .../016_echo-long-10con-single/test.yml       | 10 ------
 .../017_echo-long-5con-multi-reverse/test.sh  | 23 --------------
 .../017_echo-long-5con-multi-reverse/test.yml | 10 ------
 .../017_echo-long-5con-multi/test.sh          | 23 --------------
 .../017_echo-long-5con-multi/test.yml         | 10 ------
 .../000_kernel-4.4.x/050_unix-domain/group.sh | 31 -------------------
 .../100_mix/010_veth-unix-domain-echo/test.sh | 23 --------------
 .../010_veth-unix-domain-echo/test.yml        | 10 ------
 .../011_veth-unix-domain-echo-reverse/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../100_mix/012_veth-ipv4-echo/test.sh        | 23 --------------
 .../100_mix/012_veth-ipv4-echo/test.yml       | 10 ------
 .../100_mix/013_veth-ipv6-echo/test.sh        | 23 --------------
 .../100_mix/013_veth-ipv6-echo/test.yml       | 10 ------
 .../100_mix/014_veth-tcp-echo/test.sh         | 23 --------------
 .../100_mix/014_veth-tcp-echo/test.yml        | 10 ------
 .../100_mix/015_veth-udp-echo/test.sh         | 23 --------------
 .../100_mix/015_veth-udp-echo/test.yml        | 10 ------
 .../100_mix/020_unix-domain-echo/test.sh      | 23 --------------
 .../100_mix/020_unix-domain-echo/test.yml     | 10 ------
 .../110_namespace/000_kernel-4.4.x/common.yml |  9 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../017_echo-tcp-ipv4-long-5con-multi/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../027_echo-tcp-ipv6-long-5con-multi/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../037_echo-udp-ipv4-long-5con-multi/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../047_echo-udp-ipv6-long-5con-multi/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../001_kernel-4.9.x/010_veth/group.sh        | 31 -------------------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../010_echo-short-1con-single/test.sh        | 23 --------------
 .../010_echo-short-1con-single/test.yml       | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../011_echo-short-10con-single/test.sh       | 23 --------------
 .../011_echo-short-10con-single/test.yml      | 10 ------
 .../012_echo-short-5con-multi-reverse/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../012_echo-short-5con-multi/test.sh         | 23 --------------
 .../012_echo-short-5con-multi/test.yml        | 10 ------
 .../015_echo-long-1con-single-reverse/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../015_echo-long-1con-single/test.sh         | 23 --------------
 .../015_echo-long-1con-single/test.yml        | 10 ------
 .../test.sh                                   | 23 --------------
 .../test.yml                                  | 10 ------
 .../016_echo-long-10con-single/test.sh        | 23 --------------
 .../016_echo-long-10con-single/test.yml       | 10 ------
 .../017_echo-long-5con-multi-reverse/test.sh  | 23 --------------
 .../017_echo-long-5con-multi-reverse/test.yml | 10 ------
 .../017_echo-long-5con-multi/test.sh          | 23 --------------
 .../017_echo-long-5con-multi/test.yml         | 10 ------
 .../001_kernel-4.9.x/050_unix-domain/group.sh | 31 -------------------
 .../100_mix/010_veth-unix-domain-echo/test.sh | 23 --------------
 .../010_veth-unix-domain-echo/test.yml        | 10 ------
 .../011_veth-unix-domain-echo-reverse/test.sh | 23 --------------
 .../test.yml                                  | 10 ------
 .../100_mix/012_veth-ipv4-echo/test.sh        | 23 --------------
 .../100_mix/012_veth-ipv4-echo/test.yml       | 10 ------
 .../100_mix/013_veth-ipv6-echo/test.sh        | 23 --------------
 .../100_mix/013_veth-ipv6-echo/test.yml       | 10 ------
 .../100_mix/014_veth-tcp-echo/test.sh         | 23 --------------
 .../100_mix/014_veth-tcp-echo/test.yml        | 10 ------
 .../100_mix/015_veth-udp-echo/test.sh         | 23 --------------
 .../100_mix/015_veth-udp-echo/test.yml        | 10 ------
 .../100_mix/020_unix-domain-echo/test.sh      | 23 --------------
 .../100_mix/020_unix-domain-echo/test.yml     | 10 ------
 .../110_namespace/001_kernel-4.9.x/common.yml |  9 ------
 274 files changed, 4564 deletions(-)
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/group.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/group.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/group.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/group.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.sh
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.yml
 delete mode 100644 test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml

diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
deleted file mode 100644
index 548353d7b..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short TCP/IPv4 connection over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml
deleted file mode 100644
index 3dba4a1b1..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
deleted file mode 100644
index 67fe8fca3..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short TCP/IPv4 connection over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml
deleted file mode 100644
index cffc155c7..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
deleted file mode 100644
index 1e0af3419..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short TCP/IPv4 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml
deleted file mode 100644
index 1761a6f46..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
deleted file mode 100644
index 6c9481ebd..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short TCP/IPv4 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml
deleted file mode 100644
index 1761a6f46..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
deleted file mode 100644
index d423d0b2c..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short TCP/IPv4 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml
deleted file mode 100644
index 7a56484eb..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
deleted file mode 100644
index 375d6c4ff..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short TCP/IPv4 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml
deleted file mode 100644
index 7a56484eb..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
deleted file mode 100644
index a0c735d19..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running TCP/IPv4 connection over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml
deleted file mode 100644
index ee82a84ba..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
deleted file mode 100644
index 0caa324fe..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running TCP/IPv4 connection over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml
deleted file mode 100644
index b7f9a3e8e..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
deleted file mode 100644
index f442ecbb3..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running TCP/IPv4 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml
deleted file mode 100644
index ba493194e..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
deleted file mode 100644
index 59d8c33bd..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running TCP/IPv4 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml
deleted file mode 100644
index ba493194e..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
deleted file mode 100644
index 6e7404222..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running TCP/IPv4 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml
deleted file mode 100644
index 31511f838..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
deleted file mode 100644
index 312bfe5d6..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running TCP/IPv4 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml
deleted file mode 100644
index 31511f838..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
deleted file mode 100644
index a1b40c93e..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short TCP/IPv6 connection over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml
deleted file mode 100644
index 239c9714d..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
deleted file mode 100644
index c43e0e6f4..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short TCP/IPv6 connection over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml
deleted file mode 100644
index cc2be4002..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
deleted file mode 100644
index 97d387934..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short TCP/IPv6 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml
deleted file mode 100644
index 219e0a3fd..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
deleted file mode 100644
index 072cf8ccc..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short TCP/IPv6 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml
deleted file mode 100644
index 219e0a3fd..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
deleted file mode 100644
index c22c3f17a..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short TCP/IPv6 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml
deleted file mode 100644
index f426a294d..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
deleted file mode 100644
index 6da036c5a..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short TCP/IPv6 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml
deleted file mode 100644
index f426a294d..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
deleted file mode 100644
index eea48607b..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running TCP/IPv6 connection over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml
deleted file mode 100644
index 2949a3082..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
deleted file mode 100644
index 1955a4eb6..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running TCP/IPv6 connection over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml
deleted file mode 100644
index 03076fd24..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
deleted file mode 100644
index ffe0f0ae2..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running TCP/IPv6 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml
deleted file mode 100644
index 0e76bf481..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
deleted file mode 100644
index f9b6dc010..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running TCP/IPv6 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml
deleted file mode 100644
index 0e76bf481..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
deleted file mode 100644
index 098299673..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running TCP/IPv6 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml
deleted file mode 100644
index 36649ed3d..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
deleted file mode 100644
index c4ad61354..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running TCP/IPv6 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml
deleted file mode 100644
index 36649ed3d..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
deleted file mode 100644
index 7b853e807..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short UDP/IPv4 "connection" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml
deleted file mode 100644
index 9690844df..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
deleted file mode 100644
index ec038a2f9..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short UDP/IPv4 "connection" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml
deleted file mode 100644
index 8fb2e5c82..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
deleted file mode 100644
index 0b3b2b51e..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short UDP/IPv4 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml
deleted file mode 100644
index c5ca477ab..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
deleted file mode 100644
index e6cdead68..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short UDP/IPv4 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml
deleted file mode 100644
index c5ca477ab..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
deleted file mode 100644
index 7a034441a..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short UDP/IPv4 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml
deleted file mode 100644
index 1024edf9d..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
deleted file mode 100644
index bd6ee9297..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short UDP/IPv4 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml
deleted file mode 100644
index 1024edf9d..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
deleted file mode 100644
index 2d4e0b45e..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running UDP/IPv4 "connection" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml
deleted file mode 100644
index 01da74b56..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
deleted file mode 100644
index 66e3c5ca9..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running UDP/IPv4 "connection" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml
deleted file mode 100644
index f5723e839..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
deleted file mode 100644
index 5bfcf54a7..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running UDP/IPv4 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml
deleted file mode 100644
index 301f17f03..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
deleted file mode 100644
index 4b9080054..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running UDP/IPv4 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml
deleted file mode 100644
index 301f17f03..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
deleted file mode 100644
index 648fe0e38..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running UDP/IPv4 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml
deleted file mode 100644
index 71ac7c5e9..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
deleted file mode 100644
index a26ef736e..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running UDP/IPv4 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml
deleted file mode 100644
index 71ac7c5e9..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
deleted file mode 100644
index 75b750279..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short UDP/IPv6 "connection" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml
deleted file mode 100644
index 6eb882469..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
deleted file mode 100644
index a07797bc8..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short UDP/IPv6 "connection" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml
deleted file mode 100644
index 8f9042716..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
deleted file mode 100644
index 1e0510c87..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short UDP/IPv6 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml
deleted file mode 100644
index 3a0273801..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
deleted file mode 100644
index 246af5ea1..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short UDP/IPv6 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml
deleted file mode 100644
index 3a0273801..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
deleted file mode 100644
index 48fd07f1f..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short UDP/IPv6 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml
deleted file mode 100644
index 244aace55..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
deleted file mode 100644
index 95fd609fe..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short UDP/IPv6 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml
deleted file mode 100644
index 244aace55..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
deleted file mode 100644
index d60b1f3ad..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running UDP/IPv6 "connection" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml
deleted file mode 100644
index 272751bcd..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
deleted file mode 100644
index d0d21cd23..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running UDP/IPv6 "connection" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml
deleted file mode 100644
index 422f5094e..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
deleted file mode 100644
index e3d232d68..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running UDP/IPv6 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml
deleted file mode 100644
index f28f40948..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
deleted file mode 100644
index 09a6670a2..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running UDP/IPv6 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml
deleted file mode 100644
index f28f40948..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
deleted file mode 100644
index da2db4708..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running UDP/IPv6 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml
deleted file mode 100644
index 44c17178d..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
deleted file mode 100644
index 91c784f50..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running UDP/IPv6 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml
deleted file mode 100644
index 44c17178d..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/group.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/group.sh
deleted file mode 100644
index 91c199ee2..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/group.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# SUMMARY: Kernel tests
-# LABELS: kernel-extra
-
-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/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
deleted file mode 100644
index db1b72cb3..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short connection over a unix domain socket in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml
deleted file mode 100644
index d35d3db2f..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.sh
deleted file mode 100644
index 354851f30..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short connection over a unix domain socket
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.yml
deleted file mode 100644
index b0c7c1626..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
deleted file mode 100644
index e2870eecd..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short connections over a unix domain socket in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml
deleted file mode 100644
index 2cb4a86ae..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.sh
deleted file mode 100644
index 39542014a..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short connections over a unix domain socket
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.yml
deleted file mode 100644
index 2cb4a86ae..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
deleted file mode 100644
index b85800212..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short connections over a unix domain socket in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml
deleted file mode 100644
index 227648861..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.sh
deleted file mode 100644
index c12c41213..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short connections over a unix domain socket
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.yml
deleted file mode 100644
index 227648861..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
deleted file mode 100644
index f3054ce0a..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running connection over a unix domain socket in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml
deleted file mode 100644
index c6572a4e8..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.sh
deleted file mode 100644
index 3e00fec41..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running connection over a unix domain socket
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.yml
deleted file mode 100644
index b8b63b691..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
deleted file mode 100644
index a48dece2a..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running connections over a unix domain socket in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml
deleted file mode 100644
index c52904247..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.sh
deleted file mode 100644
index cee5a8540..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running connections over a unix domain socket
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.yml
deleted file mode 100644
index c52904247..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
deleted file mode 100644
index c830d8b00..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running connections over a unix domain socket in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml
deleted file mode 100644
index 17494740e..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.sh
deleted file mode 100644
index c9b3128f4..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running connections over a unix domain socket
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.yml
deleted file mode 100644
index 17494740e..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/group.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/group.sh
deleted file mode 100644
index 91c199ee2..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/group.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# SUMMARY: Kernel tests
-# LABELS: kernel-extra
-
-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/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.sh
deleted file mode 100644
index 3537d952f..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent TCP/UDP/IPv4/IPv6 and unix domain socket connections
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.yml
deleted file mode 100644
index 83aeca8c0..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
deleted file mode 100644
index 2a8a5159a..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent TCP/UDP/IPv4/IPv6 and unix domain socket connections in reverse direction
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml
deleted file mode 100644
index 3c588eafc..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix-reverse"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.sh
deleted file mode 100644
index af913221d..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent TCP/UDP IPv4 socket connections
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.yml
deleted file mode 100644
index bb11a7b90..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv4"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.sh
deleted file mode 100644
index 19d13f5cb..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent TCP/UDP IPv6 socket connections
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.yml
deleted file mode 100644
index 2005451ea..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv6"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.sh
deleted file mode 100644
index 655c20b8e..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent TCP socket connections
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.yml
deleted file mode 100644
index 3fc59cabf..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix-tcp"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.sh
deleted file mode 100644
index 555556e95..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent UDP socket connections
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.yml
deleted file mode 100644
index 9cfa79227..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix-udp"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.sh
deleted file mode 100644
index 8828a067f..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent unix domain socket connections
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.yml
deleted file mode 100644
index c499a1ee4..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml
deleted file mode 100644
index 6cc89062a..000000000
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-kernel:
-  image: linuxkit/kernel:4.4.126
-  cmdline: "console=ttyS0 console=ttyAMA0"
-init:
-  - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
-  - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
-trust:
-  org:
-    - linuxkit
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
deleted file mode 100644
index 548353d7b..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short TCP/IPv4 connection over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml
deleted file mode 100644
index 3dba4a1b1..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
deleted file mode 100644
index 67fe8fca3..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short TCP/IPv4 connection over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml
deleted file mode 100644
index cffc155c7..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
deleted file mode 100644
index 1e0af3419..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short TCP/IPv4 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml
deleted file mode 100644
index 1761a6f46..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
deleted file mode 100644
index 6c9481ebd..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short TCP/IPv4 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml
deleted file mode 100644
index 1761a6f46..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
deleted file mode 100644
index d423d0b2c..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short TCP/IPv4 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml
deleted file mode 100644
index 7a56484eb..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
deleted file mode 100644
index 375d6c4ff..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short TCP/IPv4 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml
deleted file mode 100644
index 7a56484eb..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
deleted file mode 100644
index a0c735d19..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running TCP/IPv4 connection over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml
deleted file mode 100644
index ee82a84ba..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
deleted file mode 100644
index 0caa324fe..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running TCP/IPv4 connection over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml
deleted file mode 100644
index b7f9a3e8e..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
deleted file mode 100644
index f442ecbb3..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running TCP/IPv4 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml
deleted file mode 100644
index ba493194e..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
deleted file mode 100644
index 59d8c33bd..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running TCP/IPv4 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml
deleted file mode 100644
index ba493194e..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
deleted file mode 100644
index 6e7404222..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running TCP/IPv4 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml
deleted file mode 100644
index 31511f838..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
deleted file mode 100644
index 312bfe5d6..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running TCP/IPv4 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml
deleted file mode 100644
index 31511f838..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
deleted file mode 100644
index a1b40c93e..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short TCP/IPv6 connection over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml
deleted file mode 100644
index 239c9714d..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
deleted file mode 100644
index c43e0e6f4..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short TCP/IPv6 connection over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml
deleted file mode 100644
index cc2be4002..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
deleted file mode 100644
index 97d387934..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short TCP/IPv6 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml
deleted file mode 100644
index 219e0a3fd..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
deleted file mode 100644
index 072cf8ccc..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short TCP/IPv6 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml
deleted file mode 100644
index 219e0a3fd..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
deleted file mode 100644
index c22c3f17a..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short TCP/IPv6 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml
deleted file mode 100644
index f426a294d..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
deleted file mode 100644
index 6da036c5a..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short TCP/IPv6 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml
deleted file mode 100644
index f426a294d..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
deleted file mode 100644
index eea48607b..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running TCP/IPv6 connection over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml
deleted file mode 100644
index 2949a3082..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
deleted file mode 100644
index 1955a4eb6..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running TCP/IPv6 connection over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml
deleted file mode 100644
index 03076fd24..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
deleted file mode 100644
index ffe0f0ae2..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running TCP/IPv6 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml
deleted file mode 100644
index 0e76bf481..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
deleted file mode 100644
index f9b6dc010..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running TCP/IPv6 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml
deleted file mode 100644
index 0e76bf481..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
deleted file mode 100644
index 098299673..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running TCP/IPv6 connections over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml
deleted file mode 100644
index 36649ed3d..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
deleted file mode 100644
index c4ad61354..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running TCP/IPv6 connections over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml
deleted file mode 100644
index 36649ed3d..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
deleted file mode 100644
index 7b853e807..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short UDP/IPv4 "connection" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml
deleted file mode 100644
index 9690844df..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
deleted file mode 100644
index ec038a2f9..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short UDP/IPv4 "connection" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml
deleted file mode 100644
index 8fb2e5c82..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
deleted file mode 100644
index 0b3b2b51e..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short UDP/IPv4 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml
deleted file mode 100644
index c5ca477ab..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
deleted file mode 100644
index e6cdead68..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short UDP/IPv4 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml
deleted file mode 100644
index c5ca477ab..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
deleted file mode 100644
index 7a034441a..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short UDP/IPv4 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml
deleted file mode 100644
index 1024edf9d..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
deleted file mode 100644
index bd6ee9297..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short UDP/IPv4 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml
deleted file mode 100644
index 1024edf9d..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
deleted file mode 100644
index 2d4e0b45e..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running UDP/IPv4 "connection" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml
deleted file mode 100644
index 01da74b56..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
deleted file mode 100644
index 66e3c5ca9..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running UDP/IPv4 "connection" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml
deleted file mode 100644
index f5723e839..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
deleted file mode 100644
index 5bfcf54a7..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running UDP/IPv4 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml
deleted file mode 100644
index 301f17f03..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
deleted file mode 100644
index 4b9080054..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running UDP/IPv4 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml
deleted file mode 100644
index 301f17f03..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
deleted file mode 100644
index 648fe0e38..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running UDP/IPv4 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml
deleted file mode 100644
index 71ac7c5e9..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
deleted file mode 100644
index a26ef736e..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running UDP/IPv4 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml
deleted file mode 100644
index 71ac7c5e9..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
deleted file mode 100644
index 75b750279..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short UDP/IPv6 "connection" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml
deleted file mode 100644
index 6eb882469..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
deleted file mode 100644
index a07797bc8..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short UDP/IPv6 "connection" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml
deleted file mode 100644
index 8f9042716..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
deleted file mode 100644
index 1e0510c87..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short UDP/IPv6 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml
deleted file mode 100644
index 3a0273801..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
deleted file mode 100644
index 246af5ea1..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short UDP/IPv6 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml
deleted file mode 100644
index 3a0273801..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
deleted file mode 100644
index 48fd07f1f..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short UDP/IPv6 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml
deleted file mode 100644
index 244aace55..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
deleted file mode 100644
index 95fd609fe..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short UDP/IPv6 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml
deleted file mode 100644
index 244aace55..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
deleted file mode 100644
index d60b1f3ad..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running UDP/IPv6 "connection" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml
deleted file mode 100644
index 272751bcd..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
deleted file mode 100644
index d0d21cd23..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running UDP/IPv6 "connection" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml
deleted file mode 100644
index 422f5094e..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
deleted file mode 100644
index e3d232d68..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running UDP/IPv6 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml
deleted file mode 100644
index f28f40948..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
deleted file mode 100644
index 09a6670a2..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running UDP/IPv6 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml
deleted file mode 100644
index f28f40948..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
deleted file mode 100644
index da2db4708..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running UDP/IPv6 "connections" over a veth pair in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml
deleted file mode 100644
index 44c17178d..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
deleted file mode 100644
index 91c784f50..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running UDP/IPv6 "connections" over a veth pair
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml
deleted file mode 100644
index 44c17178d..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/group.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/group.sh
deleted file mode 100644
index 91c199ee2..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/group.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# SUMMARY: Kernel tests
-# LABELS: kernel-extra
-
-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/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
deleted file mode 100644
index db1b72cb3..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short connection over a unix domain socket in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml
deleted file mode 100644
index d35d3db2f..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.sh
deleted file mode 100644
index 354851f30..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single short connection over a unix domain socket
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.yml
deleted file mode 100644
index b0c7c1626..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/010_echo-short-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
deleted file mode 100644
index e2870eecd..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short connections over a unix domain socket in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml
deleted file mode 100644
index 2cb4a86ae..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.sh
deleted file mode 100644
index 39542014a..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent short connections over a unix domain socket
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.yml
deleted file mode 100644
index 2cb4a86ae..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/011_echo-short-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
deleted file mode 100644
index b85800212..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short connections over a unix domain socket in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml
deleted file mode 100644
index 227648861..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.sh
deleted file mode 100644
index c12c41213..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent short connections over a unix domain socket
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.yml
deleted file mode 100644
index 227648861..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/012_echo-short-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
deleted file mode 100644
index f3054ce0a..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running connection over a unix domain socket in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml
deleted file mode 100644
index c6572a4e8..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1", "-r"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.sh
deleted file mode 100644
index 3e00fec41..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a single long running connection over a unix domain socket
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.yml
deleted file mode 100644
index b8b63b691..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/015_echo-long-1con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
deleted file mode 100644
index a48dece2a..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running connections over a unix domain socket in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml
deleted file mode 100644
index c52904247..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.sh
deleted file mode 100644
index cee5a8540..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with 10 concurrent long running connections over a unix domain socket
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.yml
deleted file mode 100644
index c52904247..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/016_echo-long-10con-single/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
deleted file mode 100644
index c830d8b00..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running connections over a unix domain socket in reverse order
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml
deleted file mode 100644
index 17494740e..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.sh
deleted file mode 100644
index c9b3128f4..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with multiple instances of 5 concurrent long running connections over a unix domain socket
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.yml
deleted file mode 100644
index 17494740e..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/017_echo-long-5con-multi/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/group.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/group.sh
deleted file mode 100644
index 91c199ee2..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/050_unix-domain/group.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# SUMMARY: Kernel tests
-# LABELS: kernel-extra
-
-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/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.sh
deleted file mode 100644
index 3537d952f..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent TCP/UDP/IPv4/IPv6 and unix domain socket connections
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.yml
deleted file mode 100644
index 83aeca8c0..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/010_veth-unix-domain-echo/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
deleted file mode 100644
index 2a8a5159a..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent TCP/UDP/IPv4/IPv6 and unix domain socket connections in reverse direction
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml
deleted file mode 100644
index 3c588eafc..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix-reverse"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.sh
deleted file mode 100644
index af913221d..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent TCP/UDP IPv4 socket connections
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.yml
deleted file mode 100644
index bb11a7b90..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/012_veth-ipv4-echo/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv4"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.sh
deleted file mode 100644
index 19d13f5cb..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent TCP/UDP IPv6 socket connections
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.yml
deleted file mode 100644
index 2005451ea..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/013_veth-ipv6-echo/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv6"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.sh
deleted file mode 100644
index 655c20b8e..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent TCP socket connections
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.yml
deleted file mode 100644
index 3fc59cabf..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/014_veth-tcp-echo/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix-tcp"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.sh
deleted file mode 100644
index 555556e95..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent UDP socket connections
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.yml
deleted file mode 100644
index 9cfa79227..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/015_veth-udp-echo/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix-udp"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.sh
deleted file mode 100644
index 8828a067f..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# SUMMARY: Namespace stress with a mix of concurrent unix domain socket connections
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=test-ns
-
-clean_up() {
-    rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-linuxkit build -format kernel+initrd -name ${NAME} ../../common.yml test.yml
-RESULT="$(linuxkit run -cpus 2 ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.yml
deleted file mode 100644
index c499a1ee4..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/100_mix/020_unix-domain-echo/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-onboot:
-  - name: test-ns
-    image: linuxkit/test-ns:6843859b224129726a8d5e9b7ec72841c7789dff
-    command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"]
-    mounts: # for runc
-    - type: cgroup
-      options: ["rw"]
-  - name: poweroff
-    image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d
-    command: ["/bin/sh", "/poweroff.sh", "3"]
diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml
deleted file mode 100644
index 4779ca42c..000000000
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-kernel:
-  image: linuxkit/kernel:4.9.92
-  cmdline: "console=ttyS0 console=ttyAMA0"
-init:
-  - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
-  - linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
-trust:
-  org:
-    - linuxkit

From 58dd87a72866fb9522f6a6774421477ee043744f Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@gmail.com>
Date: Wed, 4 Apr 2018 19:42:24 +0100
Subject: [PATCH 2/2] tests: Move the 4.14.x namespace tests up a level

Now that these are the only namespace tests, there is no
need to have them in their own subgroup.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
---
 .../010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh  | 0
 .../010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml | 0
 .../010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh          | 0
 .../010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml         | 0
 .../010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh | 0
 .../011_echo-tcp-ipv4-short-10con-single-reverse/test.yml         | 0
 .../010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh         | 0
 .../010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml        | 0
 .../010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh   | 0
 .../010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml  | 0
 .../010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh           | 0
 .../010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml          | 0
 .../010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh   | 0
 .../010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml  | 0
 .../010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh           | 0
 .../010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml          | 0
 .../010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh  | 0
 .../010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml | 0
 .../010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh          | 0
 .../010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml         | 0
 .../010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh    | 0
 .../010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml   | 0
 .../010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh            | 0
 .../010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml           | 0
 .../010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh  | 0
 .../010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml | 0
 .../010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh          | 0
 .../010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml         | 0
 .../010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh | 0
 .../021_echo-tcp-ipv6-short-10con-single-reverse/test.yml         | 0
 .../010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh         | 0
 .../010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml        | 0
 .../010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh   | 0
 .../010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml  | 0
 .../010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh           | 0
 .../010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml          | 0
 .../010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh   | 0
 .../010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml  | 0
 .../010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh           | 0
 .../010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml          | 0
 .../010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh  | 0
 .../010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml | 0
 .../010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh          | 0
 .../010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml         | 0
 .../010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh    | 0
 .../010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml   | 0
 .../010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh            | 0
 .../010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml           | 0
 .../010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh  | 0
 .../010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml | 0
 .../010_veth/030_echo-udp-ipv4-short-1con-single/test.sh          | 0
 .../010_veth/030_echo-udp-ipv4-short-1con-single/test.yml         | 0
 .../010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh | 0
 .../031_echo-udp-ipv4-short-10con-single-reverse/test.yml         | 0
 .../010_veth/031_echo-udp-ipv4-short-10con-single/test.sh         | 0
 .../010_veth/031_echo-udp-ipv4-short-10con-single/test.yml        | 0
 .../010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh   | 0
 .../010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml  | 0
 .../010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh           | 0
 .../010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml          | 0
 .../010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh   | 0
 .../010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml  | 0
 .../010_veth/035_echo-udp-ipv4-long-1con-single/test.sh           | 0
 .../010_veth/035_echo-udp-ipv4-long-1con-single/test.yml          | 0
 .../010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh  | 0
 .../010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml | 0
 .../010_veth/036_echo-udp-ipv4-long-10con-single/test.sh          | 0
 .../010_veth/036_echo-udp-ipv4-long-10con-single/test.yml         | 0
 .../010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh    | 0
 .../010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml   | 0
 .../010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh            | 0
 .../010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml           | 0
 .../010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh  | 0
 .../010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml | 0
 .../010_veth/040_echo-udp-ipv6-short-1con-single/test.sh          | 0
 .../010_veth/040_echo-udp-ipv6-short-1con-single/test.yml         | 0
 .../010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh | 0
 .../041_echo-udp-ipv6-short-10con-single-reverse/test.yml         | 0
 .../010_veth/041_echo-udp-ipv6-short-10con-single/test.sh         | 0
 .../010_veth/041_echo-udp-ipv6-short-10con-single/test.yml        | 0
 .../010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh   | 0
 .../010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml  | 0
 .../010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh           | 0
 .../010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml          | 0
 .../010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh   | 0
 .../010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml  | 0
 .../010_veth/045_echo-udp-ipv6-long-1con-single/test.sh           | 0
 .../010_veth/045_echo-udp-ipv6-long-1con-single/test.yml          | 0
 .../010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh  | 0
 .../010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml | 0
 .../010_veth/046_echo-udp-ipv6-long-10con-single/test.sh          | 0
 .../010_veth/046_echo-udp-ipv6-long-10con-single/test.yml         | 0
 .../010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh    | 0
 .../010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml   | 0
 .../010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh            | 0
 .../010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml           | 0
 .../110_namespace/{006_kernel-4.14.x => }/010_veth/group.sh       | 0
 .../050_unix-domain/010_echo-short-1con-single-reverse/test.sh    | 0
 .../050_unix-domain/010_echo-short-1con-single-reverse/test.yml   | 0
 .../050_unix-domain/010_echo-short-1con-single/test.sh            | 0
 .../050_unix-domain/010_echo-short-1con-single/test.yml           | 0
 .../050_unix-domain/011_echo-short-10con-single-reverse/test.sh   | 0
 .../050_unix-domain/011_echo-short-10con-single-reverse/test.yml  | 0
 .../050_unix-domain/011_echo-short-10con-single/test.sh           | 0
 .../050_unix-domain/011_echo-short-10con-single/test.yml          | 0
 .../050_unix-domain/012_echo-short-5con-multi-reverse/test.sh     | 0
 .../050_unix-domain/012_echo-short-5con-multi-reverse/test.yml    | 0
 .../050_unix-domain/012_echo-short-5con-multi/test.sh             | 0
 .../050_unix-domain/012_echo-short-5con-multi/test.yml            | 0
 .../050_unix-domain/015_echo-long-1con-single-reverse/test.sh     | 0
 .../050_unix-domain/015_echo-long-1con-single-reverse/test.yml    | 0
 .../050_unix-domain/015_echo-long-1con-single/test.sh             | 0
 .../050_unix-domain/015_echo-long-1con-single/test.yml            | 0
 .../050_unix-domain/016_echo-long-10con-single-reverse/test.sh    | 0
 .../050_unix-domain/016_echo-long-10con-single-reverse/test.yml   | 0
 .../050_unix-domain/016_echo-long-10con-single/test.sh            | 0
 .../050_unix-domain/016_echo-long-10con-single/test.yml           | 0
 .../050_unix-domain/017_echo-long-5con-multi-reverse/test.sh      | 0
 .../050_unix-domain/017_echo-long-5con-multi-reverse/test.yml     | 0
 .../050_unix-domain/017_echo-long-5con-multi/test.sh              | 0
 .../050_unix-domain/017_echo-long-5con-multi/test.yml             | 0
 .../{006_kernel-4.14.x => }/050_unix-domain/group.sh              | 0
 .../100_mix/010_veth-unix-domain-echo/test.sh                     | 0
 .../100_mix/010_veth-unix-domain-echo/test.yml                    | 0
 .../100_mix/011_veth-unix-domain-echo-reverse/test.sh             | 0
 .../100_mix/011_veth-unix-domain-echo-reverse/test.yml            | 0
 .../{006_kernel-4.14.x => }/100_mix/012_veth-ipv4-echo/test.sh    | 0
 .../{006_kernel-4.14.x => }/100_mix/012_veth-ipv4-echo/test.yml   | 0
 .../{006_kernel-4.14.x => }/100_mix/013_veth-ipv6-echo/test.sh    | 0
 .../{006_kernel-4.14.x => }/100_mix/013_veth-ipv6-echo/test.yml   | 0
 .../{006_kernel-4.14.x => }/100_mix/014_veth-tcp-echo/test.sh     | 0
 .../{006_kernel-4.14.x => }/100_mix/014_veth-tcp-echo/test.yml    | 0
 .../{006_kernel-4.14.x => }/100_mix/015_veth-udp-echo/test.sh     | 0
 .../{006_kernel-4.14.x => }/100_mix/015_veth-udp-echo/test.yml    | 0
 .../{006_kernel-4.14.x => }/100_mix/020_unix-domain-echo/test.sh  | 0
 .../{006_kernel-4.14.x => }/100_mix/020_unix-domain-echo/test.yml | 0
 .../020_kernel/110_namespace/{006_kernel-4.14.x => }/common.yml   | 0
 137 files changed, 0 insertions(+), 0 deletions(-)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/010_veth/group.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/010_echo-short-1con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/010_echo-short-1con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/010_echo-short-1con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/010_echo-short-1con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/011_echo-short-10con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/011_echo-short-10con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/011_echo-short-10con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/011_echo-short-10con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/012_echo-short-5con-multi/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/012_echo-short-5con-multi/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/015_echo-long-1con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/015_echo-long-1con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/015_echo-long-1con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/015_echo-long-1con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/016_echo-long-10con-single-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/016_echo-long-10con-single-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/016_echo-long-10con-single/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/016_echo-long-10con-single/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/017_echo-long-5con-multi/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/017_echo-long-5con-multi/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/050_unix-domain/group.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/010_veth-unix-domain-echo/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/010_veth-unix-domain-echo/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/011_veth-unix-domain-echo-reverse/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/011_veth-unix-domain-echo-reverse/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/012_veth-ipv4-echo/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/012_veth-ipv4-echo/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/013_veth-ipv6-echo/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/013_veth-ipv6-echo/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/014_veth-tcp-echo/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/014_veth-tcp-echo/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/015_veth-udp-echo/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/015_veth-udp-echo/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/020_unix-domain-echo/test.sh (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/100_mix/020_unix-domain-echo/test.yml (100%)
 rename test/cases/020_kernel/110_namespace/{006_kernel-4.14.x => }/common.yml (100%)

diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
rename to test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml
rename to test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/group.sh b/test/cases/020_kernel/110_namespace/010_veth/group.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/010_veth/group.sh
rename to test/cases/020_kernel/110_namespace/010_veth/group.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single/test.sh b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single/test.sh
rename to test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/010_echo-short-1con-single/test.yml
rename to test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single/test.sh b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single/test.sh
rename to test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/011_echo-short-10con-single/test.yml
rename to test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi/test.sh
rename to test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/012_echo-short-5con-multi/test.yml
rename to test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single/test.sh b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single/test.sh
rename to test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/015_echo-long-1con-single/test.yml
rename to test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single/test.sh b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single/test.sh
rename to test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/016_echo-long-10con-single/test.yml
rename to test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi/test.sh b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi/test.sh
rename to test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/017_echo-long-5con-multi/test.yml
rename to test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/group.sh b/test/cases/020_kernel/110_namespace/050_unix-domain/group.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/050_unix-domain/group.sh
rename to test/cases/020_kernel/110_namespace/050_unix-domain/group.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/010_veth-unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/010_veth-unix-domain-echo/test.sh
rename to test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/010_veth-unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/010_veth-unix-domain-echo/test.yml
rename to test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh b/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh
rename to test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml b/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/011_veth-unix-domain-echo-reverse/test.yml
rename to test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/012_veth-ipv4-echo/test.sh b/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/012_veth-ipv4-echo/test.sh
rename to test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/012_veth-ipv4-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/012_veth-ipv4-echo/test.yml
rename to test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/013_veth-ipv6-echo/test.sh b/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/013_veth-ipv6-echo/test.sh
rename to test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/013_veth-ipv6-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/013_veth-ipv6-echo/test.yml
rename to test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/014_veth-tcp-echo/test.sh b/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/014_veth-tcp-echo/test.sh
rename to test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/014_veth-tcp-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/014_veth-tcp-echo/test.yml
rename to test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/015_veth-udp-echo/test.sh b/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/015_veth-udp-echo/test.sh
rename to test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/015_veth-udp-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/015_veth-udp-echo/test.yml
rename to test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/020_unix-domain-echo/test.sh b/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.sh
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/020_unix-domain-echo/test.sh
rename to test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.sh
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/020_unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/100_mix/020_unix-domain-echo/test.yml
rename to test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml
diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml b/test/cases/020_kernel/110_namespace/common.yml
similarity index 100%
rename from test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml
rename to test/cases/020_kernel/110_namespace/common.yml