diff --git a/test/zdtm.desc b/test/zdtm.desc
index bce3e9e9c..0671d4988 100644
--- a/test/zdtm.desc
+++ b/test/zdtm.desc
@@ -1 +1 @@
-{ 'dir': 'zdtm/live/', 'exclude': [ 'static/route_rules', 'static/criu-rtc.so' ] }
+{ 'dir': 'zdtm/', 'exclude': [ 'static/route_rules', 'static/criu-rtc.so', 'lib/parseargs.sh', 'lib/stop_and_chk.sh' ] }
diff --git a/test/zdtm.py b/test/zdtm.py
index 01b20e7b3..a0caa328d 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -418,7 +418,7 @@ class zdtm_test:
 			print " <<< " + "=" * 32
 
 	def static(self):
-		return self.__name.split('/')[2] == 'static'
+		return self.__name.split('/')[1] == 'static'
 
 	def ns(self):
 		return self.__flavor.ns
diff --git a/test/zdtm/Makefile b/test/zdtm/Makefile
index 4d6639557..8abf2144d 100644
--- a/test/zdtm/Makefile
+++ b/test/zdtm/Makefile
@@ -1,15 +1,18 @@
-SUBDIRS	=	lib live
+SUBDIRS	=	lib static transition
 
 default:	all
-.PHONY: default lib live
+.PHONY: default lib static transition
 
 lib:
 	$(MAKE) -C lib all
 
-live: lib
-	$(MAKE) -C live all
+static: lib
+	$(MAKE) -C static all
 
-all: lib live
+transition: lib
+	$(MAKE) -C transition all
+
+all: lib static transition
 	@true
 %:
 	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
diff --git a/test/zdtm/live/Makefile b/test/zdtm/live/Makefile
deleted file mode 100644
index 87c0e7ef4..000000000
--- a/test/zdtm/live/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS	= transition static
-
-default:	all
-.PHONY: default
-
-%:
-	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
diff --git a/test/zdtm/live/static/Makefile b/test/zdtm/static/Makefile
similarity index 98%
rename from test/zdtm/live/static/Makefile
rename to test/zdtm/static/Makefile
index 06e59853f..74712b5b4 100644
--- a/test/zdtm/live/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -1,6 +1,6 @@
-include ../../Makefile.inc
+include ../Makefile.inc
 
-LIBDIR	= ../../lib
+LIBDIR	= ../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
 override CPPFLAGS += -I$(LIBDIR)
 CFLAGS	= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
@@ -400,7 +400,7 @@ criu-rtc.pb-c.c: criu-rtc.proto
 	protoc-c --proto_path=. --c_out=. criu-rtc.proto
 
 criu-rtc.so: criu-rtc.c criu-rtc.pb-c.c
-	$(CC) -g -Wall -shared -nostartfiles criu-rtc.c criu-rtc.pb-c.c -o criu-rtc.so -iquote ../../../../criu/include -fPIC $(USERCFLAGS)
+	$(CC) -g -Wall -shared -nostartfiles criu-rtc.c criu-rtc.pb-c.c -o criu-rtc.so -iquote ../../../criu/include -fPIC $(USERCFLAGS)
 
 .PHONY:	force clean cleandep cleanout realclean start check_start stop wait_stop
 
diff --git a/test/zdtm/live/static/aio00.c b/test/zdtm/static/aio00.c
similarity index 100%
rename from test/zdtm/live/static/aio00.c
rename to test/zdtm/static/aio00.c
diff --git a/test/zdtm/live/static/aio00.desc b/test/zdtm/static/aio00.desc
similarity index 100%
rename from test/zdtm/live/static/aio00.desc
rename to test/zdtm/static/aio00.desc
diff --git a/test/zdtm/live/static/apparmor.c b/test/zdtm/static/apparmor.c
similarity index 100%
rename from test/zdtm/live/static/apparmor.c
rename to test/zdtm/static/apparmor.c
diff --git a/test/zdtm/live/static/apparmor.checkskip b/test/zdtm/static/apparmor.checkskip
similarity index 100%
rename from test/zdtm/live/static/apparmor.checkskip
rename to test/zdtm/static/apparmor.checkskip
diff --git a/test/zdtm/live/static/apparmor.desc b/test/zdtm/static/apparmor.desc
similarity index 100%
rename from test/zdtm/live/static/apparmor.desc
rename to test/zdtm/static/apparmor.desc
diff --git a/test/zdtm/live/static/apparmor.profile b/test/zdtm/static/apparmor.profile
similarity index 100%
rename from test/zdtm/live/static/apparmor.profile
rename to test/zdtm/static/apparmor.profile
diff --git a/test/zdtm/live/static/arm-neon00.c b/test/zdtm/static/arm-neon00.c
similarity index 100%
rename from test/zdtm/live/static/arm-neon00.c
rename to test/zdtm/static/arm-neon00.c
diff --git a/test/zdtm/live/static/arm-neon00.desc b/test/zdtm/static/arm-neon00.desc
similarity index 100%
rename from test/zdtm/live/static/arm-neon00.desc
rename to test/zdtm/static/arm-neon00.desc
diff --git a/test/zdtm/live/static/bind-mount.c b/test/zdtm/static/bind-mount.c
similarity index 100%
rename from test/zdtm/live/static/bind-mount.c
rename to test/zdtm/static/bind-mount.c
diff --git a/test/zdtm/live/static/bind-mount.desc b/test/zdtm/static/bind-mount.desc
similarity index 100%
rename from test/zdtm/live/static/bind-mount.desc
rename to test/zdtm/static/bind-mount.desc
diff --git a/test/zdtm/live/static/binfmt_misc.c b/test/zdtm/static/binfmt_misc.c
similarity index 100%
rename from test/zdtm/live/static/binfmt_misc.c
rename to test/zdtm/static/binfmt_misc.c
diff --git a/test/zdtm/live/static/binfmt_misc.desc b/test/zdtm/static/binfmt_misc.desc
similarity index 100%
rename from test/zdtm/live/static/binfmt_misc.desc
rename to test/zdtm/static/binfmt_misc.desc
diff --git a/test/zdtm/live/static/bridge.c b/test/zdtm/static/bridge.c
similarity index 100%
rename from test/zdtm/live/static/bridge.c
rename to test/zdtm/static/bridge.c
diff --git a/test/zdtm/live/static/bridge.desc b/test/zdtm/static/bridge.desc
similarity index 100%
rename from test/zdtm/live/static/bridge.desc
rename to test/zdtm/static/bridge.desc
diff --git a/test/zdtm/live/static/busyloop00.c b/test/zdtm/static/busyloop00.c
similarity index 100%
rename from test/zdtm/live/static/busyloop00.c
rename to test/zdtm/static/busyloop00.c
diff --git a/test/zdtm/live/static/caps00.c b/test/zdtm/static/caps00.c
similarity index 100%
rename from test/zdtm/live/static/caps00.c
rename to test/zdtm/static/caps00.c
diff --git a/test/zdtm/live/static/caps00.desc b/test/zdtm/static/caps00.desc
similarity index 100%
rename from test/zdtm/live/static/caps00.desc
rename to test/zdtm/static/caps00.desc
diff --git a/test/zdtm/live/static/cgroup00.c b/test/zdtm/static/cgroup00.c
similarity index 100%
rename from test/zdtm/live/static/cgroup00.c
rename to test/zdtm/static/cgroup00.c
diff --git a/test/zdtm/live/static/cgroup00.desc b/test/zdtm/static/cgroup00.desc
similarity index 100%
rename from test/zdtm/live/static/cgroup00.desc
rename to test/zdtm/static/cgroup00.desc
diff --git a/test/zdtm/live/static/cgroup00.hook b/test/zdtm/static/cgroup00.hook
similarity index 100%
rename from test/zdtm/live/static/cgroup00.hook
rename to test/zdtm/static/cgroup00.hook
diff --git a/test/zdtm/live/static/cgroup00.opts b/test/zdtm/static/cgroup00.opts
similarity index 100%
rename from test/zdtm/live/static/cgroup00.opts
rename to test/zdtm/static/cgroup00.opts
diff --git a/test/zdtm/live/static/cgroup01.c b/test/zdtm/static/cgroup01.c
similarity index 100%
rename from test/zdtm/live/static/cgroup01.c
rename to test/zdtm/static/cgroup01.c
diff --git a/test/zdtm/live/static/cgroup01.desc b/test/zdtm/static/cgroup01.desc
similarity index 100%
rename from test/zdtm/live/static/cgroup01.desc
rename to test/zdtm/static/cgroup01.desc
diff --git a/test/zdtm/live/static/cgroup01.hook b/test/zdtm/static/cgroup01.hook
similarity index 100%
rename from test/zdtm/live/static/cgroup01.hook
rename to test/zdtm/static/cgroup01.hook
diff --git a/test/zdtm/live/static/cgroup01.opts b/test/zdtm/static/cgroup01.opts
similarity index 100%
rename from test/zdtm/live/static/cgroup01.opts
rename to test/zdtm/static/cgroup01.opts
diff --git a/test/zdtm/live/static/cgroup02.c b/test/zdtm/static/cgroup02.c
similarity index 100%
rename from test/zdtm/live/static/cgroup02.c
rename to test/zdtm/static/cgroup02.c
diff --git a/test/zdtm/live/static/cgroup02.desc b/test/zdtm/static/cgroup02.desc
similarity index 100%
rename from test/zdtm/live/static/cgroup02.desc
rename to test/zdtm/static/cgroup02.desc
diff --git a/test/zdtm/live/static/cgroup02.hook b/test/zdtm/static/cgroup02.hook
similarity index 100%
rename from test/zdtm/live/static/cgroup02.hook
rename to test/zdtm/static/cgroup02.hook
diff --git a/test/zdtm/live/static/cgroup02.opts b/test/zdtm/static/cgroup02.opts
similarity index 100%
rename from test/zdtm/live/static/cgroup02.opts
rename to test/zdtm/static/cgroup02.opts
diff --git a/test/zdtm/live/static/cgroup03.c b/test/zdtm/static/cgroup03.c
similarity index 100%
rename from test/zdtm/live/static/cgroup03.c
rename to test/zdtm/static/cgroup03.c
diff --git a/test/zdtm/live/static/cgroup03.desc b/test/zdtm/static/cgroup03.desc
similarity index 100%
rename from test/zdtm/live/static/cgroup03.desc
rename to test/zdtm/static/cgroup03.desc
diff --git a/test/zdtm/live/static/cgroup03.hook b/test/zdtm/static/cgroup03.hook
similarity index 100%
rename from test/zdtm/live/static/cgroup03.hook
rename to test/zdtm/static/cgroup03.hook
diff --git a/test/zdtm/live/static/child_opened_proc.c b/test/zdtm/static/child_opened_proc.c
similarity index 100%
rename from test/zdtm/live/static/child_opened_proc.c
rename to test/zdtm/static/child_opened_proc.c
diff --git a/test/zdtm/live/static/chroot-file.c b/test/zdtm/static/chroot-file.c
similarity index 100%
rename from test/zdtm/live/static/chroot-file.c
rename to test/zdtm/static/chroot-file.c
diff --git a/test/zdtm/live/static/chroot-file.desc b/test/zdtm/static/chroot-file.desc
similarity index 100%
rename from test/zdtm/live/static/chroot-file.desc
rename to test/zdtm/static/chroot-file.desc
diff --git a/test/zdtm/live/static/chroot.c b/test/zdtm/static/chroot.c
similarity index 100%
rename from test/zdtm/live/static/chroot.c
rename to test/zdtm/static/chroot.c
diff --git a/test/zdtm/live/static/chroot.desc b/test/zdtm/static/chroot.desc
similarity index 100%
rename from test/zdtm/live/static/chroot.desc
rename to test/zdtm/static/chroot.desc
diff --git a/test/zdtm/live/static/clean_mntns.c b/test/zdtm/static/clean_mntns.c
similarity index 100%
rename from test/zdtm/live/static/clean_mntns.c
rename to test/zdtm/static/clean_mntns.c
diff --git a/test/zdtm/live/static/clean_mntns.desc b/test/zdtm/static/clean_mntns.desc
similarity index 100%
rename from test/zdtm/live/static/clean_mntns.desc
rename to test/zdtm/static/clean_mntns.desc
diff --git a/test/zdtm/live/static/cmdlinenv00.c b/test/zdtm/static/cmdlinenv00.c
similarity index 100%
rename from test/zdtm/live/static/cmdlinenv00.c
rename to test/zdtm/static/cmdlinenv00.c
diff --git a/test/zdtm/live/static/cmdlinenv00.desc b/test/zdtm/static/cmdlinenv00.desc
similarity index 100%
rename from test/zdtm/live/static/cmdlinenv00.desc
rename to test/zdtm/static/cmdlinenv00.desc
diff --git a/test/zdtm/live/static/conntracks b/test/zdtm/static/conntracks
similarity index 100%
rename from test/zdtm/live/static/conntracks
rename to test/zdtm/static/conntracks
diff --git a/test/zdtm/live/static/conntracks.desc b/test/zdtm/static/conntracks.desc
similarity index 100%
rename from test/zdtm/live/static/conntracks.desc
rename to test/zdtm/static/conntracks.desc
diff --git a/test/zdtm/live/static/console.c b/test/zdtm/static/console.c
similarity index 100%
rename from test/zdtm/live/static/console.c
rename to test/zdtm/static/console.c
diff --git a/test/zdtm/live/static/console.desc b/test/zdtm/static/console.desc
similarity index 100%
rename from test/zdtm/live/static/console.desc
rename to test/zdtm/static/console.desc
diff --git a/test/zdtm/live/static/cow00.c b/test/zdtm/static/cow00.c
similarity index 100%
rename from test/zdtm/live/static/cow00.c
rename to test/zdtm/static/cow00.c
diff --git a/test/zdtm/live/static/cow00.desc b/test/zdtm/static/cow00.desc
similarity index 100%
rename from test/zdtm/live/static/cow00.desc
rename to test/zdtm/static/cow00.desc
diff --git a/test/zdtm/live/static/cow01.c b/test/zdtm/static/cow01.c
similarity index 100%
rename from test/zdtm/live/static/cow01.c
rename to test/zdtm/static/cow01.c
diff --git a/test/zdtm/live/static/cow01.desc b/test/zdtm/static/cow01.desc
similarity index 100%
rename from test/zdtm/live/static/cow01.desc
rename to test/zdtm/static/cow01.desc
diff --git a/test/zdtm/live/static/criu-rtc.c b/test/zdtm/static/criu-rtc.c
similarity index 100%
rename from test/zdtm/live/static/criu-rtc.c
rename to test/zdtm/static/criu-rtc.c
diff --git a/test/zdtm/live/static/criu-rtc.proto b/test/zdtm/static/criu-rtc.proto
similarity index 100%
rename from test/zdtm/live/static/criu-rtc.proto
rename to test/zdtm/static/criu-rtc.proto
diff --git a/test/zdtm/live/static/cwd00.c b/test/zdtm/static/cwd00.c
similarity index 100%
rename from test/zdtm/live/static/cwd00.c
rename to test/zdtm/static/cwd00.c
diff --git a/test/zdtm/live/static/cwd01.c b/test/zdtm/static/cwd01.c
similarity index 100%
rename from test/zdtm/live/static/cwd01.c
rename to test/zdtm/static/cwd01.c
diff --git a/test/zdtm/live/static/cwd02.c b/test/zdtm/static/cwd02.c
similarity index 100%
rename from test/zdtm/live/static/cwd02.c
rename to test/zdtm/static/cwd02.c
diff --git a/test/zdtm/live/static/deleted_dev.c b/test/zdtm/static/deleted_dev.c
similarity index 100%
rename from test/zdtm/live/static/deleted_dev.c
rename to test/zdtm/static/deleted_dev.c
diff --git a/test/zdtm/live/static/deleted_dev.desc b/test/zdtm/static/deleted_dev.desc
similarity index 100%
rename from test/zdtm/live/static/deleted_dev.desc
rename to test/zdtm/static/deleted_dev.desc
diff --git a/test/zdtm/live/static/deleted_unix_sock.c b/test/zdtm/static/deleted_unix_sock.c
similarity index 100%
rename from test/zdtm/live/static/deleted_unix_sock.c
rename to test/zdtm/static/deleted_unix_sock.c
diff --git a/test/zdtm/live/static/different_creds.c b/test/zdtm/static/different_creds.c
similarity index 100%
rename from test/zdtm/live/static/different_creds.c
rename to test/zdtm/static/different_creds.c
diff --git a/test/zdtm/live/static/different_creds.desc b/test/zdtm/static/different_creds.desc
similarity index 100%
rename from test/zdtm/live/static/different_creds.desc
rename to test/zdtm/static/different_creds.desc
diff --git a/test/zdtm/live/static/dumpable01.c b/test/zdtm/static/dumpable01.c
similarity index 100%
rename from test/zdtm/live/static/dumpable01.c
rename to test/zdtm/static/dumpable01.c
diff --git a/test/zdtm/live/static/dumpable02.c b/test/zdtm/static/dumpable02.c
similarity index 100%
rename from test/zdtm/live/static/dumpable02.c
rename to test/zdtm/static/dumpable02.c
diff --git a/test/zdtm/live/static/dumpable02.desc b/test/zdtm/static/dumpable02.desc
similarity index 100%
rename from test/zdtm/live/static/dumpable02.desc
rename to test/zdtm/static/dumpable02.desc
diff --git a/test/zdtm/live/static/env00.c b/test/zdtm/static/env00.c
similarity index 100%
rename from test/zdtm/live/static/env00.c
rename to test/zdtm/static/env00.c
diff --git a/test/zdtm/live/static/eventfs00.c b/test/zdtm/static/eventfs00.c
similarity index 100%
rename from test/zdtm/live/static/eventfs00.c
rename to test/zdtm/static/eventfs00.c
diff --git a/test/zdtm/live/static/fanotify00.c b/test/zdtm/static/fanotify00.c
similarity index 100%
rename from test/zdtm/live/static/fanotify00.c
rename to test/zdtm/static/fanotify00.c
diff --git a/test/zdtm/live/static/fanotify00.desc b/test/zdtm/static/fanotify00.desc
similarity index 100%
rename from test/zdtm/live/static/fanotify00.desc
rename to test/zdtm/static/fanotify00.desc
diff --git a/test/zdtm/live/static/fd.c b/test/zdtm/static/fd.c
similarity index 100%
rename from test/zdtm/live/static/fd.c
rename to test/zdtm/static/fd.c
diff --git a/test/zdtm/live/static/fd.desc b/test/zdtm/static/fd.desc
similarity index 100%
rename from test/zdtm/live/static/fd.desc
rename to test/zdtm/static/fd.desc
diff --git a/test/zdtm/live/static/fdt_shared.c b/test/zdtm/static/fdt_shared.c
similarity index 100%
rename from test/zdtm/live/static/fdt_shared.c
rename to test/zdtm/static/fdt_shared.c
diff --git a/test/zdtm/live/static/fifo-ghost.c b/test/zdtm/static/fifo-ghost.c
similarity index 100%
rename from test/zdtm/live/static/fifo-ghost.c
rename to test/zdtm/static/fifo-ghost.c
diff --git a/test/zdtm/live/static/fifo-rowo-pair.c b/test/zdtm/static/fifo-rowo-pair.c
similarity index 100%
rename from test/zdtm/live/static/fifo-rowo-pair.c
rename to test/zdtm/static/fifo-rowo-pair.c
diff --git a/test/zdtm/live/static/fifo.c b/test/zdtm/static/fifo.c
similarity index 100%
rename from test/zdtm/live/static/fifo.c
rename to test/zdtm/static/fifo.c
diff --git a/test/zdtm/live/static/fifo_ro.c b/test/zdtm/static/fifo_ro.c
similarity index 100%
rename from test/zdtm/live/static/fifo_ro.c
rename to test/zdtm/static/fifo_ro.c
diff --git a/test/zdtm/live/static/fifo_wronly.c b/test/zdtm/static/fifo_wronly.c
similarity index 100%
rename from test/zdtm/live/static/fifo_wronly.c
rename to test/zdtm/static/fifo_wronly.c
diff --git a/test/zdtm/live/static/file_append.c b/test/zdtm/static/file_append.c
similarity index 100%
rename from test/zdtm/live/static/file_append.c
rename to test/zdtm/static/file_append.c
diff --git a/test/zdtm/live/static/file_attr.c b/test/zdtm/static/file_attr.c
similarity index 100%
rename from test/zdtm/live/static/file_attr.c
rename to test/zdtm/static/file_attr.c
diff --git a/test/zdtm/live/static/file_fown.c b/test/zdtm/static/file_fown.c
similarity index 100%
rename from test/zdtm/live/static/file_fown.c
rename to test/zdtm/static/file_fown.c
diff --git a/test/zdtm/live/static/file_fown.desc b/test/zdtm/static/file_fown.desc
similarity index 100%
rename from test/zdtm/live/static/file_fown.desc
rename to test/zdtm/static/file_fown.desc
diff --git a/test/zdtm/live/static/file_locks00.c b/test/zdtm/static/file_locks00.c
similarity index 100%
rename from test/zdtm/live/static/file_locks00.c
rename to test/zdtm/static/file_locks00.c
diff --git a/test/zdtm/live/static/file_locks00.desc b/test/zdtm/static/file_locks00.desc
similarity index 100%
rename from test/zdtm/live/static/file_locks00.desc
rename to test/zdtm/static/file_locks00.desc
diff --git a/test/zdtm/live/static/file_locks00.opts b/test/zdtm/static/file_locks00.opts
similarity index 100%
rename from test/zdtm/live/static/file_locks00.opts
rename to test/zdtm/static/file_locks00.opts
diff --git a/test/zdtm/live/static/file_locks01.c b/test/zdtm/static/file_locks01.c
similarity index 100%
rename from test/zdtm/live/static/file_locks01.c
rename to test/zdtm/static/file_locks01.c
diff --git a/test/zdtm/live/static/file_locks01.desc b/test/zdtm/static/file_locks01.desc
similarity index 100%
rename from test/zdtm/live/static/file_locks01.desc
rename to test/zdtm/static/file_locks01.desc
diff --git a/test/zdtm/live/static/file_locks01.opts b/test/zdtm/static/file_locks01.opts
similarity index 100%
rename from test/zdtm/live/static/file_locks01.opts
rename to test/zdtm/static/file_locks01.opts
diff --git a/test/zdtm/live/static/file_locks02.c b/test/zdtm/static/file_locks02.c
similarity index 100%
rename from test/zdtm/live/static/file_locks02.c
rename to test/zdtm/static/file_locks02.c
diff --git a/test/zdtm/live/static/file_locks02.desc b/test/zdtm/static/file_locks02.desc
similarity index 100%
rename from test/zdtm/live/static/file_locks02.desc
rename to test/zdtm/static/file_locks02.desc
diff --git a/test/zdtm/live/static/file_locks02.opts b/test/zdtm/static/file_locks02.opts
similarity index 100%
rename from test/zdtm/live/static/file_locks02.opts
rename to test/zdtm/static/file_locks02.opts
diff --git a/test/zdtm/live/static/file_locks03.c b/test/zdtm/static/file_locks03.c
similarity index 100%
rename from test/zdtm/live/static/file_locks03.c
rename to test/zdtm/static/file_locks03.c
diff --git a/test/zdtm/live/static/file_locks03.desc b/test/zdtm/static/file_locks03.desc
similarity index 100%
rename from test/zdtm/live/static/file_locks03.desc
rename to test/zdtm/static/file_locks03.desc
diff --git a/test/zdtm/live/static/file_locks03.opts b/test/zdtm/static/file_locks03.opts
similarity index 100%
rename from test/zdtm/live/static/file_locks03.opts
rename to test/zdtm/static/file_locks03.opts
diff --git a/test/zdtm/live/static/file_locks04.c b/test/zdtm/static/file_locks04.c
similarity index 100%
rename from test/zdtm/live/static/file_locks04.c
rename to test/zdtm/static/file_locks04.c
diff --git a/test/zdtm/live/static/file_locks04.desc b/test/zdtm/static/file_locks04.desc
similarity index 100%
rename from test/zdtm/live/static/file_locks04.desc
rename to test/zdtm/static/file_locks04.desc
diff --git a/test/zdtm/live/static/file_locks04.opts b/test/zdtm/static/file_locks04.opts
similarity index 100%
rename from test/zdtm/live/static/file_locks04.opts
rename to test/zdtm/static/file_locks04.opts
diff --git a/test/zdtm/live/static/file_locks05.c b/test/zdtm/static/file_locks05.c
similarity index 100%
rename from test/zdtm/live/static/file_locks05.c
rename to test/zdtm/static/file_locks05.c
diff --git a/test/zdtm/live/static/file_locks05.desc b/test/zdtm/static/file_locks05.desc
similarity index 100%
rename from test/zdtm/live/static/file_locks05.desc
rename to test/zdtm/static/file_locks05.desc
diff --git a/test/zdtm/live/static/file_locks05.opts b/test/zdtm/static/file_locks05.opts
similarity index 100%
rename from test/zdtm/live/static/file_locks05.opts
rename to test/zdtm/static/file_locks05.opts
diff --git a/test/zdtm/live/static/file_shared.c b/test/zdtm/static/file_shared.c
similarity index 100%
rename from test/zdtm/live/static/file_shared.c
rename to test/zdtm/static/file_shared.c
diff --git a/test/zdtm/live/static/fpu00.c b/test/zdtm/static/fpu00.c
similarity index 100%
rename from test/zdtm/live/static/fpu00.c
rename to test/zdtm/static/fpu00.c
diff --git a/test/zdtm/live/static/fpu00.desc b/test/zdtm/static/fpu00.desc
similarity index 100%
rename from test/zdtm/live/static/fpu00.desc
rename to test/zdtm/static/fpu00.desc
diff --git a/test/zdtm/live/static/fpu01.c b/test/zdtm/static/fpu01.c
similarity index 100%
rename from test/zdtm/live/static/fpu01.c
rename to test/zdtm/static/fpu01.c
diff --git a/test/zdtm/live/static/fpu01.desc b/test/zdtm/static/fpu01.desc
similarity index 100%
rename from test/zdtm/live/static/fpu01.desc
rename to test/zdtm/static/fpu01.desc
diff --git a/test/zdtm/live/static/futex-rl.c b/test/zdtm/static/futex-rl.c
similarity index 100%
rename from test/zdtm/live/static/futex-rl.c
rename to test/zdtm/static/futex-rl.c
diff --git a/test/zdtm/live/static/futex.c b/test/zdtm/static/futex.c
similarity index 100%
rename from test/zdtm/live/static/futex.c
rename to test/zdtm/static/futex.c
diff --git a/test/zdtm/live/static/get_smaps_bits.c b/test/zdtm/static/get_smaps_bits.c
similarity index 100%
rename from test/zdtm/live/static/get_smaps_bits.c
rename to test/zdtm/static/get_smaps_bits.c
diff --git a/test/zdtm/live/static/groups.c b/test/zdtm/static/groups.c
similarity index 100%
rename from test/zdtm/live/static/groups.c
rename to test/zdtm/static/groups.c
diff --git a/test/zdtm/live/static/groups.desc b/test/zdtm/static/groups.desc
similarity index 100%
rename from test/zdtm/live/static/groups.desc
rename to test/zdtm/static/groups.desc
diff --git a/test/zdtm/live/static/grow_map.c b/test/zdtm/static/grow_map.c
similarity index 100%
rename from test/zdtm/live/static/grow_map.c
rename to test/zdtm/static/grow_map.c
diff --git a/test/zdtm/live/static/grow_map02.c b/test/zdtm/static/grow_map02.c
similarity index 100%
rename from test/zdtm/live/static/grow_map02.c
rename to test/zdtm/static/grow_map02.c
diff --git a/test/zdtm/live/static/grow_map03.c b/test/zdtm/static/grow_map03.c
similarity index 100%
rename from test/zdtm/live/static/grow_map03.c
rename to test/zdtm/static/grow_map03.c
diff --git a/test/zdtm/live/static/inotify00.c b/test/zdtm/static/inotify00.c
similarity index 100%
rename from test/zdtm/live/static/inotify00.c
rename to test/zdtm/static/inotify00.c
diff --git a/test/zdtm/live/static/inotify00.desc b/test/zdtm/static/inotify00.desc
similarity index 100%
rename from test/zdtm/live/static/inotify00.desc
rename to test/zdtm/static/inotify00.desc
diff --git a/test/zdtm/live/static/inotify00.opts b/test/zdtm/static/inotify00.opts
similarity index 100%
rename from test/zdtm/live/static/inotify00.opts
rename to test/zdtm/static/inotify00.opts
diff --git a/test/zdtm/live/static/inotify01.c b/test/zdtm/static/inotify01.c
similarity index 100%
rename from test/zdtm/live/static/inotify01.c
rename to test/zdtm/static/inotify01.c
diff --git a/test/zdtm/live/static/inotify01.desc b/test/zdtm/static/inotify01.desc
similarity index 100%
rename from test/zdtm/live/static/inotify01.desc
rename to test/zdtm/static/inotify01.desc
diff --git a/test/zdtm/live/static/inotify02.c b/test/zdtm/static/inotify02.c
similarity index 100%
rename from test/zdtm/live/static/inotify02.c
rename to test/zdtm/static/inotify02.c
diff --git a/test/zdtm/live/static/inotify02.desc b/test/zdtm/static/inotify02.desc
similarity index 100%
rename from test/zdtm/live/static/inotify02.desc
rename to test/zdtm/static/inotify02.desc
diff --git a/test/zdtm/live/static/inotify_irmap.c b/test/zdtm/static/inotify_irmap.c
similarity index 100%
rename from test/zdtm/live/static/inotify_irmap.c
rename to test/zdtm/static/inotify_irmap.c
diff --git a/test/zdtm/live/static/inotify_irmap.desc b/test/zdtm/static/inotify_irmap.desc
similarity index 100%
rename from test/zdtm/live/static/inotify_irmap.desc
rename to test/zdtm/static/inotify_irmap.desc
diff --git a/test/zdtm/live/static/inotify_system.c b/test/zdtm/static/inotify_system.c
similarity index 100%
rename from test/zdtm/live/static/inotify_system.c
rename to test/zdtm/static/inotify_system.c
diff --git a/test/zdtm/live/static/inotify_system.desc b/test/zdtm/static/inotify_system.desc
similarity index 100%
rename from test/zdtm/live/static/inotify_system.desc
rename to test/zdtm/static/inotify_system.desc
diff --git a/test/zdtm/live/static/inotify_system_nodel.c b/test/zdtm/static/inotify_system_nodel.c
similarity index 100%
rename from test/zdtm/live/static/inotify_system_nodel.c
rename to test/zdtm/static/inotify_system_nodel.c
diff --git a/test/zdtm/live/static/inotify_system_nodel.desc b/test/zdtm/static/inotify_system_nodel.desc
similarity index 100%
rename from test/zdtm/live/static/inotify_system_nodel.desc
rename to test/zdtm/static/inotify_system_nodel.desc
diff --git a/test/zdtm/live/static/ipc_namespace.c b/test/zdtm/static/ipc_namespace.c
similarity index 100%
rename from test/zdtm/live/static/ipc_namespace.c
rename to test/zdtm/static/ipc_namespace.c
diff --git a/test/zdtm/live/static/ipc_namespace.desc b/test/zdtm/static/ipc_namespace.desc
similarity index 100%
rename from test/zdtm/live/static/ipc_namespace.desc
rename to test/zdtm/static/ipc_namespace.desc
diff --git a/test/zdtm/live/static/jobctl00.c b/test/zdtm/static/jobctl00.c
similarity index 100%
rename from test/zdtm/live/static/jobctl00.c
rename to test/zdtm/static/jobctl00.c
diff --git a/test/zdtm/live/static/lib/criu-rtc.so b/test/zdtm/static/lib/criu-rtc.so
similarity index 100%
rename from test/zdtm/live/static/lib/criu-rtc.so
rename to test/zdtm/static/lib/criu-rtc.so
diff --git a/test/zdtm/live/static/link10.c b/test/zdtm/static/link10.c
similarity index 100%
rename from test/zdtm/live/static/link10.c
rename to test/zdtm/static/link10.c
diff --git a/test/zdtm/live/static/loginuid.c b/test/zdtm/static/loginuid.c
similarity index 100%
rename from test/zdtm/live/static/loginuid.c
rename to test/zdtm/static/loginuid.c
diff --git a/test/zdtm/live/static/loginuid.desc b/test/zdtm/static/loginuid.desc
similarity index 100%
rename from test/zdtm/live/static/loginuid.desc
rename to test/zdtm/static/loginuid.desc
diff --git a/test/zdtm/live/static/maps00.c b/test/zdtm/static/maps00.c
similarity index 100%
rename from test/zdtm/live/static/maps00.c
rename to test/zdtm/static/maps00.c
diff --git a/test/zdtm/live/static/maps01.c b/test/zdtm/static/maps01.c
similarity index 100%
rename from test/zdtm/live/static/maps01.c
rename to test/zdtm/static/maps01.c
diff --git a/test/zdtm/live/static/maps01.desc b/test/zdtm/static/maps01.desc
similarity index 100%
rename from test/zdtm/live/static/maps01.desc
rename to test/zdtm/static/maps01.desc
diff --git a/test/zdtm/live/static/maps02.c b/test/zdtm/static/maps02.c
similarity index 100%
rename from test/zdtm/live/static/maps02.c
rename to test/zdtm/static/maps02.c
diff --git a/test/zdtm/live/static/maps03.c b/test/zdtm/static/maps03.c
similarity index 100%
rename from test/zdtm/live/static/maps03.c
rename to test/zdtm/static/maps03.c
diff --git a/test/zdtm/live/static/maps03.desc b/test/zdtm/static/maps03.desc
similarity index 100%
rename from test/zdtm/live/static/maps03.desc
rename to test/zdtm/static/maps03.desc
diff --git a/test/zdtm/live/static/maps04.c b/test/zdtm/static/maps04.c
similarity index 100%
rename from test/zdtm/live/static/maps04.c
rename to test/zdtm/static/maps04.c
diff --git a/test/zdtm/live/static/maps05.c b/test/zdtm/static/maps05.c
similarity index 100%
rename from test/zdtm/live/static/maps05.c
rename to test/zdtm/static/maps05.c
diff --git a/test/zdtm/live/static/maps_file_prot.c b/test/zdtm/static/maps_file_prot.c
similarity index 100%
rename from test/zdtm/live/static/maps_file_prot.c
rename to test/zdtm/static/maps_file_prot.c
diff --git a/test/zdtm/live/static/mem-touch.c b/test/zdtm/static/mem-touch.c
similarity index 100%
rename from test/zdtm/live/static/mem-touch.c
rename to test/zdtm/static/mem-touch.c
diff --git a/test/zdtm/live/static/mem-touch.desc b/test/zdtm/static/mem-touch.desc
similarity index 100%
rename from test/zdtm/live/static/mem-touch.desc
rename to test/zdtm/static/mem-touch.desc
diff --git a/test/zdtm/live/static/mlock_setuid.c b/test/zdtm/static/mlock_setuid.c
similarity index 100%
rename from test/zdtm/live/static/mlock_setuid.c
rename to test/zdtm/static/mlock_setuid.c
diff --git a/test/zdtm/live/static/mlock_setuid.desc b/test/zdtm/static/mlock_setuid.desc
similarity index 100%
rename from test/zdtm/live/static/mlock_setuid.desc
rename to test/zdtm/static/mlock_setuid.desc
diff --git a/test/zdtm/live/static/mmx00.c b/test/zdtm/static/mmx00.c
similarity index 100%
rename from test/zdtm/live/static/mmx00.c
rename to test/zdtm/static/mmx00.c
diff --git a/test/zdtm/live/static/mmx00.desc b/test/zdtm/static/mmx00.desc
similarity index 100%
rename from test/zdtm/live/static/mmx00.desc
rename to test/zdtm/static/mmx00.desc
diff --git a/test/zdtm/live/static/mnt_ext_auto.c b/test/zdtm/static/mnt_ext_auto.c
similarity index 100%
rename from test/zdtm/live/static/mnt_ext_auto.c
rename to test/zdtm/static/mnt_ext_auto.c
diff --git a/test/zdtm/live/static/mnt_ext_auto.desc b/test/zdtm/static/mnt_ext_auto.desc
similarity index 100%
rename from test/zdtm/live/static/mnt_ext_auto.desc
rename to test/zdtm/static/mnt_ext_auto.desc
diff --git a/test/zdtm/live/static/mnt_ext_auto.opts b/test/zdtm/static/mnt_ext_auto.opts
similarity index 100%
rename from test/zdtm/live/static/mnt_ext_auto.opts
rename to test/zdtm/static/mnt_ext_auto.opts
diff --git a/test/zdtm/live/static/mnt_ext_master.c b/test/zdtm/static/mnt_ext_master.c
similarity index 100%
rename from test/zdtm/live/static/mnt_ext_master.c
rename to test/zdtm/static/mnt_ext_master.c
diff --git a/test/zdtm/live/static/mnt_ext_master.desc b/test/zdtm/static/mnt_ext_master.desc
similarity index 100%
rename from test/zdtm/live/static/mnt_ext_master.desc
rename to test/zdtm/static/mnt_ext_master.desc
diff --git a/test/zdtm/live/static/mnt_ext_master.opts b/test/zdtm/static/mnt_ext_master.opts
similarity index 100%
rename from test/zdtm/live/static/mnt_ext_master.opts
rename to test/zdtm/static/mnt_ext_master.opts
diff --git a/test/zdtm/live/static/mnt_ro_bind.c b/test/zdtm/static/mnt_ro_bind.c
similarity index 100%
rename from test/zdtm/live/static/mnt_ro_bind.c
rename to test/zdtm/static/mnt_ro_bind.c
diff --git a/test/zdtm/live/static/mnt_ro_bind.desc b/test/zdtm/static/mnt_ro_bind.desc
similarity index 100%
rename from test/zdtm/live/static/mnt_ro_bind.desc
rename to test/zdtm/static/mnt_ro_bind.desc
diff --git a/test/zdtm/live/static/mntns_deleted.c b/test/zdtm/static/mntns_deleted.c
similarity index 100%
rename from test/zdtm/live/static/mntns_deleted.c
rename to test/zdtm/static/mntns_deleted.c
diff --git a/test/zdtm/live/static/mntns_deleted.desc b/test/zdtm/static/mntns_deleted.desc
similarity index 100%
rename from test/zdtm/live/static/mntns_deleted.desc
rename to test/zdtm/static/mntns_deleted.desc
diff --git a/test/zdtm/live/static/mntns_link_ghost.c b/test/zdtm/static/mntns_link_ghost.c
similarity index 100%
rename from test/zdtm/live/static/mntns_link_ghost.c
rename to test/zdtm/static/mntns_link_ghost.c
diff --git a/test/zdtm/live/static/mntns_link_ghost.desc b/test/zdtm/static/mntns_link_ghost.desc
similarity index 100%
rename from test/zdtm/live/static/mntns_link_ghost.desc
rename to test/zdtm/static/mntns_link_ghost.desc
diff --git a/test/zdtm/live/static/mntns_link_remap.c b/test/zdtm/static/mntns_link_remap.c
similarity index 100%
rename from test/zdtm/live/static/mntns_link_remap.c
rename to test/zdtm/static/mntns_link_remap.c
diff --git a/test/zdtm/live/static/mntns_link_remap.desc b/test/zdtm/static/mntns_link_remap.desc
similarity index 100%
rename from test/zdtm/live/static/mntns_link_remap.desc
rename to test/zdtm/static/mntns_link_remap.desc
diff --git a/test/zdtm/live/static/mntns_link_remap.opts b/test/zdtm/static/mntns_link_remap.opts
similarity index 100%
rename from test/zdtm/live/static/mntns_link_remap.opts
rename to test/zdtm/static/mntns_link_remap.opts
diff --git a/test/zdtm/live/static/mntns_open.c b/test/zdtm/static/mntns_open.c
similarity index 100%
rename from test/zdtm/live/static/mntns_open.c
rename to test/zdtm/static/mntns_open.c
diff --git a/test/zdtm/live/static/mntns_open.desc b/test/zdtm/static/mntns_open.desc
similarity index 100%
rename from test/zdtm/live/static/mntns_open.desc
rename to test/zdtm/static/mntns_open.desc
diff --git a/test/zdtm/live/static/mntns_root_bind.c b/test/zdtm/static/mntns_root_bind.c
similarity index 100%
rename from test/zdtm/live/static/mntns_root_bind.c
rename to test/zdtm/static/mntns_root_bind.c
diff --git a/test/zdtm/live/static/mntns_root_bind.desc b/test/zdtm/static/mntns_root_bind.desc
similarity index 100%
rename from test/zdtm/live/static/mntns_root_bind.desc
rename to test/zdtm/static/mntns_root_bind.desc
diff --git a/test/zdtm/live/static/mntns_root_bind02.c b/test/zdtm/static/mntns_root_bind02.c
similarity index 100%
rename from test/zdtm/live/static/mntns_root_bind02.c
rename to test/zdtm/static/mntns_root_bind02.c
diff --git a/test/zdtm/live/static/mntns_root_bind02.desc b/test/zdtm/static/mntns_root_bind02.desc
similarity index 100%
rename from test/zdtm/live/static/mntns_root_bind02.desc
rename to test/zdtm/static/mntns_root_bind02.desc
diff --git a/test/zdtm/live/static/mntns_rw_ro_rw.c b/test/zdtm/static/mntns_rw_ro_rw.c
similarity index 100%
rename from test/zdtm/live/static/mntns_rw_ro_rw.c
rename to test/zdtm/static/mntns_rw_ro_rw.c
diff --git a/test/zdtm/live/static/mntns_rw_ro_rw.desc b/test/zdtm/static/mntns_rw_ro_rw.desc
similarity index 100%
rename from test/zdtm/live/static/mntns_rw_ro_rw.desc
rename to test/zdtm/static/mntns_rw_ro_rw.desc
diff --git a/test/zdtm/live/static/mntns_shared_bind.c b/test/zdtm/static/mntns_shared_bind.c
similarity index 100%
rename from test/zdtm/live/static/mntns_shared_bind.c
rename to test/zdtm/static/mntns_shared_bind.c
diff --git a/test/zdtm/live/static/mntns_shared_bind.desc b/test/zdtm/static/mntns_shared_bind.desc
similarity index 100%
rename from test/zdtm/live/static/mntns_shared_bind.desc
rename to test/zdtm/static/mntns_shared_bind.desc
diff --git a/test/zdtm/live/static/mntns_shared_bind02.c b/test/zdtm/static/mntns_shared_bind02.c
similarity index 100%
rename from test/zdtm/live/static/mntns_shared_bind02.c
rename to test/zdtm/static/mntns_shared_bind02.c
diff --git a/test/zdtm/live/static/mntns_shared_bind02.desc b/test/zdtm/static/mntns_shared_bind02.desc
similarity index 100%
rename from test/zdtm/live/static/mntns_shared_bind02.desc
rename to test/zdtm/static/mntns_shared_bind02.desc
diff --git a/test/zdtm/live/static/mount_paths.c b/test/zdtm/static/mount_paths.c
similarity index 100%
rename from test/zdtm/live/static/mount_paths.c
rename to test/zdtm/static/mount_paths.c
diff --git a/test/zdtm/live/static/mount_paths.desc b/test/zdtm/static/mount_paths.desc
similarity index 100%
rename from test/zdtm/live/static/mount_paths.desc
rename to test/zdtm/static/mount_paths.desc
diff --git a/test/zdtm/live/static/mountpoints.c b/test/zdtm/static/mountpoints.c
similarity index 100%
rename from test/zdtm/live/static/mountpoints.c
rename to test/zdtm/static/mountpoints.c
diff --git a/test/zdtm/live/static/mountpoints.desc b/test/zdtm/static/mountpoints.desc
similarity index 100%
rename from test/zdtm/live/static/mountpoints.desc
rename to test/zdtm/static/mountpoints.desc
diff --git a/test/zdtm/live/static/mprotect00.c b/test/zdtm/static/mprotect00.c
similarity index 100%
rename from test/zdtm/live/static/mprotect00.c
rename to test/zdtm/static/mprotect00.c
diff --git a/test/zdtm/live/static/msgque.c b/test/zdtm/static/msgque.c
similarity index 100%
rename from test/zdtm/live/static/msgque.c
rename to test/zdtm/static/msgque.c
diff --git a/test/zdtm/live/static/msgque.desc b/test/zdtm/static/msgque.desc
similarity index 100%
rename from test/zdtm/live/static/msgque.desc
rename to test/zdtm/static/msgque.desc
diff --git a/test/zdtm/live/static/mtime_mmap.c b/test/zdtm/static/mtime_mmap.c
similarity index 100%
rename from test/zdtm/live/static/mtime_mmap.c
rename to test/zdtm/static/mtime_mmap.c
diff --git a/test/zdtm/live/static/netns-dev.c b/test/zdtm/static/netns-dev.c
similarity index 100%
rename from test/zdtm/live/static/netns-dev.c
rename to test/zdtm/static/netns-dev.c
diff --git a/test/zdtm/live/static/netns-dev.desc b/test/zdtm/static/netns-dev.desc
similarity index 100%
rename from test/zdtm/live/static/netns-dev.desc
rename to test/zdtm/static/netns-dev.desc
diff --git a/test/zdtm/live/static/netns-nf.c b/test/zdtm/static/netns-nf.c
similarity index 100%
rename from test/zdtm/live/static/netns-nf.c
rename to test/zdtm/static/netns-nf.c
diff --git a/test/zdtm/live/static/netns-nf.desc b/test/zdtm/static/netns-nf.desc
similarity index 100%
rename from test/zdtm/live/static/netns-nf.desc
rename to test/zdtm/static/netns-nf.desc
diff --git a/test/zdtm/live/static/netns.c b/test/zdtm/static/netns.c
similarity index 100%
rename from test/zdtm/live/static/netns.c
rename to test/zdtm/static/netns.c
diff --git a/test/zdtm/live/static/netns.desc b/test/zdtm/static/netns.desc
similarity index 100%
rename from test/zdtm/live/static/netns.desc
rename to test/zdtm/static/netns.desc
diff --git a/test/zdtm/live/static/oom_score_adj.c b/test/zdtm/static/oom_score_adj.c
similarity index 100%
rename from test/zdtm/live/static/oom_score_adj.c
rename to test/zdtm/static/oom_score_adj.c
diff --git a/test/zdtm/live/static/overmount_dev.c b/test/zdtm/static/overmount_dev.c
similarity index 100%
rename from test/zdtm/live/static/overmount_dev.c
rename to test/zdtm/static/overmount_dev.c
diff --git a/test/zdtm/live/static/overmount_dev.desc b/test/zdtm/static/overmount_dev.desc
similarity index 100%
rename from test/zdtm/live/static/overmount_dev.desc
rename to test/zdtm/static/overmount_dev.desc
diff --git a/test/zdtm/live/static/overmount_fifo.c b/test/zdtm/static/overmount_fifo.c
similarity index 100%
rename from test/zdtm/live/static/overmount_fifo.c
rename to test/zdtm/static/overmount_fifo.c
diff --git a/test/zdtm/live/static/overmount_fifo.desc b/test/zdtm/static/overmount_fifo.desc
similarity index 100%
rename from test/zdtm/live/static/overmount_fifo.desc
rename to test/zdtm/static/overmount_fifo.desc
diff --git a/test/zdtm/live/static/overmount_file.c b/test/zdtm/static/overmount_file.c
similarity index 100%
rename from test/zdtm/live/static/overmount_file.c
rename to test/zdtm/static/overmount_file.c
diff --git a/test/zdtm/live/static/overmount_file.desc b/test/zdtm/static/overmount_file.desc
similarity index 100%
rename from test/zdtm/live/static/overmount_file.desc
rename to test/zdtm/static/overmount_file.desc
diff --git a/test/zdtm/live/static/overmount_sock.c b/test/zdtm/static/overmount_sock.c
similarity index 100%
rename from test/zdtm/live/static/overmount_sock.c
rename to test/zdtm/static/overmount_sock.c
diff --git a/test/zdtm/live/static/overmount_sock.desc b/test/zdtm/static/overmount_sock.desc
similarity index 100%
rename from test/zdtm/live/static/overmount_sock.desc
rename to test/zdtm/static/overmount_sock.desc
diff --git a/test/zdtm/live/static/packet_sock.c b/test/zdtm/static/packet_sock.c
similarity index 100%
rename from test/zdtm/live/static/packet_sock.c
rename to test/zdtm/static/packet_sock.c
diff --git a/test/zdtm/live/static/packet_sock.desc b/test/zdtm/static/packet_sock.desc
similarity index 100%
rename from test/zdtm/live/static/packet_sock.desc
rename to test/zdtm/static/packet_sock.desc
diff --git a/test/zdtm/live/static/packet_sock_mmap.c b/test/zdtm/static/packet_sock_mmap.c
similarity index 100%
rename from test/zdtm/live/static/packet_sock_mmap.c
rename to test/zdtm/static/packet_sock_mmap.c
diff --git a/test/zdtm/live/static/packet_sock_mmap.desc b/test/zdtm/static/packet_sock_mmap.desc
similarity index 100%
rename from test/zdtm/live/static/packet_sock_mmap.desc
rename to test/zdtm/static/packet_sock_mmap.desc
diff --git a/test/zdtm/live/static/pdeath_sig.c b/test/zdtm/static/pdeath_sig.c
similarity index 100%
rename from test/zdtm/live/static/pdeath_sig.c
rename to test/zdtm/static/pdeath_sig.c
diff --git a/test/zdtm/live/static/pid00.c b/test/zdtm/static/pid00.c
similarity index 100%
rename from test/zdtm/live/static/pid00.c
rename to test/zdtm/static/pid00.c
diff --git a/test/zdtm/live/static/pid00.desc b/test/zdtm/static/pid00.desc
similarity index 100%
rename from test/zdtm/live/static/pid00.desc
rename to test/zdtm/static/pid00.desc
diff --git a/test/zdtm/live/static/pipe00.c b/test/zdtm/static/pipe00.c
similarity index 100%
rename from test/zdtm/live/static/pipe00.c
rename to test/zdtm/static/pipe00.c
diff --git a/test/zdtm/live/static/pipe01.c b/test/zdtm/static/pipe01.c
similarity index 100%
rename from test/zdtm/live/static/pipe01.c
rename to test/zdtm/static/pipe01.c
diff --git a/test/zdtm/live/static/pipe02.c b/test/zdtm/static/pipe02.c
similarity index 100%
rename from test/zdtm/live/static/pipe02.c
rename to test/zdtm/static/pipe02.c
diff --git a/test/zdtm/live/static/poll.c b/test/zdtm/static/poll.c
similarity index 100%
rename from test/zdtm/live/static/poll.c
rename to test/zdtm/static/poll.c
diff --git a/test/zdtm/live/static/poll.desc b/test/zdtm/static/poll.desc
similarity index 100%
rename from test/zdtm/live/static/poll.desc
rename to test/zdtm/static/poll.desc
diff --git a/test/zdtm/live/static/posix_timers.c b/test/zdtm/static/posix_timers.c
similarity index 100%
rename from test/zdtm/live/static/posix_timers.c
rename to test/zdtm/static/posix_timers.c
diff --git a/test/zdtm/live/static/proc-self.c b/test/zdtm/static/proc-self.c
similarity index 100%
rename from test/zdtm/live/static/proc-self.c
rename to test/zdtm/static/proc-self.c
diff --git a/test/zdtm/live/static/pstree.c b/test/zdtm/static/pstree.c
similarity index 100%
rename from test/zdtm/live/static/pstree.c
rename to test/zdtm/static/pstree.c
diff --git a/test/zdtm/live/static/pthread00.c b/test/zdtm/static/pthread00.c
similarity index 100%
rename from test/zdtm/live/static/pthread00.c
rename to test/zdtm/static/pthread00.c
diff --git a/test/zdtm/live/static/pthread01.c b/test/zdtm/static/pthread01.c
similarity index 100%
rename from test/zdtm/live/static/pthread01.c
rename to test/zdtm/static/pthread01.c
diff --git a/test/zdtm/live/static/pthread02.c b/test/zdtm/static/pthread02.c
similarity index 100%
rename from test/zdtm/live/static/pthread02.c
rename to test/zdtm/static/pthread02.c
diff --git a/test/zdtm/live/static/pthread02.desc b/test/zdtm/static/pthread02.desc
similarity index 100%
rename from test/zdtm/live/static/pthread02.desc
rename to test/zdtm/static/pthread02.desc
diff --git a/test/zdtm/live/static/ptrace_sig.c b/test/zdtm/static/ptrace_sig.c
similarity index 100%
rename from test/zdtm/live/static/ptrace_sig.c
rename to test/zdtm/static/ptrace_sig.c
diff --git a/test/zdtm/live/static/ptrace_sig.desc b/test/zdtm/static/ptrace_sig.desc
similarity index 100%
rename from test/zdtm/live/static/ptrace_sig.desc
rename to test/zdtm/static/ptrace_sig.desc
diff --git a/test/zdtm/live/static/pty00.c b/test/zdtm/static/pty00.c
similarity index 100%
rename from test/zdtm/live/static/pty00.c
rename to test/zdtm/static/pty00.c
diff --git a/test/zdtm/live/static/pty01.c b/test/zdtm/static/pty01.c
similarity index 100%
rename from test/zdtm/live/static/pty01.c
rename to test/zdtm/static/pty01.c
diff --git a/test/zdtm/live/static/pty02.c b/test/zdtm/static/pty02.c
similarity index 100%
rename from test/zdtm/live/static/pty02.c
rename to test/zdtm/static/pty02.c
diff --git a/test/zdtm/live/static/pty02.desc b/test/zdtm/static/pty02.desc
similarity index 100%
rename from test/zdtm/live/static/pty02.desc
rename to test/zdtm/static/pty02.desc
diff --git a/test/zdtm/live/static/pty03.c b/test/zdtm/static/pty03.c
similarity index 100%
rename from test/zdtm/live/static/pty03.c
rename to test/zdtm/static/pty03.c
diff --git a/test/zdtm/live/static/pty03.desc b/test/zdtm/static/pty03.desc
similarity index 100%
rename from test/zdtm/live/static/pty03.desc
rename to test/zdtm/static/pty03.desc
diff --git a/test/zdtm/live/static/pty04.c b/test/zdtm/static/pty04.c
similarity index 100%
rename from test/zdtm/live/static/pty04.c
rename to test/zdtm/static/pty04.c
diff --git a/test/zdtm/live/static/remap_dead_pid.c b/test/zdtm/static/remap_dead_pid.c
similarity index 100%
rename from test/zdtm/live/static/remap_dead_pid.c
rename to test/zdtm/static/remap_dead_pid.c
diff --git a/test/zdtm/live/static/remap_dead_pid.desc b/test/zdtm/static/remap_dead_pid.desc
similarity index 100%
rename from test/zdtm/live/static/remap_dead_pid.desc
rename to test/zdtm/static/remap_dead_pid.desc
diff --git a/test/zdtm/live/static/remap_dead_pid_root.c b/test/zdtm/static/remap_dead_pid_root.c
similarity index 100%
rename from test/zdtm/live/static/remap_dead_pid_root.c
rename to test/zdtm/static/remap_dead_pid_root.c
diff --git a/test/zdtm/live/static/remap_dead_pid_root.desc b/test/zdtm/static/remap_dead_pid_root.desc
similarity index 100%
rename from test/zdtm/live/static/remap_dead_pid_root.desc
rename to test/zdtm/static/remap_dead_pid_root.desc
diff --git a/test/zdtm/live/static/rlimits00.c b/test/zdtm/static/rlimits00.c
similarity index 100%
rename from test/zdtm/live/static/rlimits00.c
rename to test/zdtm/static/rlimits00.c
diff --git a/test/zdtm/live/static/rmdir_open.c b/test/zdtm/static/rmdir_open.c
similarity index 100%
rename from test/zdtm/live/static/rmdir_open.c
rename to test/zdtm/static/rmdir_open.c
diff --git a/test/zdtm/live/static/route_rules b/test/zdtm/static/route_rules
similarity index 100%
rename from test/zdtm/live/static/route_rules
rename to test/zdtm/static/route_rules
diff --git a/test/zdtm/live/static/rtc.c b/test/zdtm/static/rtc.c
similarity index 100%
rename from test/zdtm/live/static/rtc.c
rename to test/zdtm/static/rtc.c
diff --git a/test/zdtm/live/static/rtc.desc b/test/zdtm/static/rtc.desc
similarity index 100%
rename from test/zdtm/live/static/rtc.desc
rename to test/zdtm/static/rtc.desc
diff --git a/test/zdtm/live/static/sched_policy00.c b/test/zdtm/static/sched_policy00.c
similarity index 100%
rename from test/zdtm/live/static/sched_policy00.c
rename to test/zdtm/static/sched_policy00.c
diff --git a/test/zdtm/live/static/sched_policy00.desc b/test/zdtm/static/sched_policy00.desc
similarity index 100%
rename from test/zdtm/live/static/sched_policy00.desc
rename to test/zdtm/static/sched_policy00.desc
diff --git a/test/zdtm/live/static/sched_prio00.c b/test/zdtm/static/sched_prio00.c
similarity index 100%
rename from test/zdtm/live/static/sched_prio00.c
rename to test/zdtm/static/sched_prio00.c
diff --git a/test/zdtm/live/static/sched_prio00.desc b/test/zdtm/static/sched_prio00.desc
similarity index 100%
rename from test/zdtm/live/static/sched_prio00.desc
rename to test/zdtm/static/sched_prio00.desc
diff --git a/test/zdtm/live/static/seccomp_filter.c b/test/zdtm/static/seccomp_filter.c
similarity index 100%
rename from test/zdtm/live/static/seccomp_filter.c
rename to test/zdtm/static/seccomp_filter.c
diff --git a/test/zdtm/live/static/seccomp_filter.desc b/test/zdtm/static/seccomp_filter.desc
similarity index 100%
rename from test/zdtm/live/static/seccomp_filter.desc
rename to test/zdtm/static/seccomp_filter.desc
diff --git a/test/zdtm/live/static/seccomp_filter_inheritance.c b/test/zdtm/static/seccomp_filter_inheritance.c
similarity index 100%
rename from test/zdtm/live/static/seccomp_filter_inheritance.c
rename to test/zdtm/static/seccomp_filter_inheritance.c
diff --git a/test/zdtm/live/static/seccomp_filter_inheritance.desc b/test/zdtm/static/seccomp_filter_inheritance.desc
similarity index 100%
rename from test/zdtm/live/static/seccomp_filter_inheritance.desc
rename to test/zdtm/static/seccomp_filter_inheritance.desc
diff --git a/test/zdtm/live/static/seccomp_filter_tsync.c b/test/zdtm/static/seccomp_filter_tsync.c
similarity index 100%
rename from test/zdtm/live/static/seccomp_filter_tsync.c
rename to test/zdtm/static/seccomp_filter_tsync.c
diff --git a/test/zdtm/live/static/seccomp_filter_tsync.desc b/test/zdtm/static/seccomp_filter_tsync.desc
similarity index 100%
rename from test/zdtm/live/static/seccomp_filter_tsync.desc
rename to test/zdtm/static/seccomp_filter_tsync.desc
diff --git a/test/zdtm/live/static/seccomp_strict.c b/test/zdtm/static/seccomp_strict.c
similarity index 100%
rename from test/zdtm/live/static/seccomp_strict.c
rename to test/zdtm/static/seccomp_strict.c
diff --git a/test/zdtm/live/static/seccomp_strict.desc b/test/zdtm/static/seccomp_strict.desc
similarity index 100%
rename from test/zdtm/live/static/seccomp_strict.desc
rename to test/zdtm/static/seccomp_strict.desc
diff --git a/test/zdtm/live/static/selfexe00.c b/test/zdtm/static/selfexe00.c
similarity index 100%
rename from test/zdtm/live/static/selfexe00.c
rename to test/zdtm/static/selfexe00.c
diff --git a/test/zdtm/live/static/sem.c b/test/zdtm/static/sem.c
similarity index 100%
rename from test/zdtm/live/static/sem.c
rename to test/zdtm/static/sem.c
diff --git a/test/zdtm/live/static/sem.desc b/test/zdtm/static/sem.desc
similarity index 100%
rename from test/zdtm/live/static/sem.desc
rename to test/zdtm/static/sem.desc
diff --git a/test/zdtm/live/static/session00.c b/test/zdtm/static/session00.c
similarity index 100%
rename from test/zdtm/live/static/session00.c
rename to test/zdtm/static/session00.c
diff --git a/test/zdtm/live/static/session00.desc b/test/zdtm/static/session00.desc
similarity index 100%
rename from test/zdtm/live/static/session00.desc
rename to test/zdtm/static/session00.desc
diff --git a/test/zdtm/live/static/session01.c b/test/zdtm/static/session01.c
similarity index 100%
rename from test/zdtm/live/static/session01.c
rename to test/zdtm/static/session01.c
diff --git a/test/zdtm/live/static/session01.desc b/test/zdtm/static/session01.desc
similarity index 100%
rename from test/zdtm/live/static/session01.desc
rename to test/zdtm/static/session01.desc
diff --git a/test/zdtm/live/static/session02.c b/test/zdtm/static/session02.c
similarity index 100%
rename from test/zdtm/live/static/session02.c
rename to test/zdtm/static/session02.c
diff --git a/test/zdtm/live/static/session02.desc b/test/zdtm/static/session02.desc
similarity index 100%
rename from test/zdtm/live/static/session02.desc
rename to test/zdtm/static/session02.desc
diff --git a/test/zdtm/live/static/session03.c b/test/zdtm/static/session03.c
similarity index 100%
rename from test/zdtm/live/static/session03.c
rename to test/zdtm/static/session03.c
diff --git a/test/zdtm/live/static/session03.desc b/test/zdtm/static/session03.desc
similarity index 100%
rename from test/zdtm/live/static/session03.desc
rename to test/zdtm/static/session03.desc
diff --git a/test/zdtm/live/static/shm.c b/test/zdtm/static/shm.c
similarity index 100%
rename from test/zdtm/live/static/shm.c
rename to test/zdtm/static/shm.c
diff --git a/test/zdtm/live/static/shm.desc b/test/zdtm/static/shm.desc
similarity index 100%
rename from test/zdtm/live/static/shm.desc
rename to test/zdtm/static/shm.desc
diff --git a/test/zdtm/live/static/sigaltstack.c b/test/zdtm/static/sigaltstack.c
similarity index 100%
rename from test/zdtm/live/static/sigaltstack.c
rename to test/zdtm/static/sigaltstack.c
diff --git a/test/zdtm/live/static/signalfd00.c b/test/zdtm/static/signalfd00.c
similarity index 100%
rename from test/zdtm/live/static/signalfd00.c
rename to test/zdtm/static/signalfd00.c
diff --git a/test/zdtm/live/static/sigpending.c b/test/zdtm/static/sigpending.c
similarity index 100%
rename from test/zdtm/live/static/sigpending.c
rename to test/zdtm/static/sigpending.c
diff --git a/test/zdtm/live/static/sk-freebind-false.c b/test/zdtm/static/sk-freebind-false.c
similarity index 100%
rename from test/zdtm/live/static/sk-freebind-false.c
rename to test/zdtm/static/sk-freebind-false.c
diff --git a/test/zdtm/live/static/sk-freebind.c b/test/zdtm/static/sk-freebind.c
similarity index 100%
rename from test/zdtm/live/static/sk-freebind.c
rename to test/zdtm/static/sk-freebind.c
diff --git a/test/zdtm/live/static/sk-netlink.c b/test/zdtm/static/sk-netlink.c
similarity index 100%
rename from test/zdtm/live/static/sk-netlink.c
rename to test/zdtm/static/sk-netlink.c
diff --git a/test/zdtm/live/static/sk-netlink.desc b/test/zdtm/static/sk-netlink.desc
similarity index 100%
rename from test/zdtm/live/static/sk-netlink.desc
rename to test/zdtm/static/sk-netlink.desc
diff --git a/test/zdtm/live/static/sk-unix-rel.c b/test/zdtm/static/sk-unix-rel.c
similarity index 100%
rename from test/zdtm/live/static/sk-unix-rel.c
rename to test/zdtm/static/sk-unix-rel.c
diff --git a/test/zdtm/live/static/sk-unix-unconn.c b/test/zdtm/static/sk-unix-unconn.c
similarity index 100%
rename from test/zdtm/live/static/sk-unix-unconn.c
rename to test/zdtm/static/sk-unix-unconn.c
diff --git a/test/zdtm/live/static/sleeping00.c b/test/zdtm/static/sleeping00.c
similarity index 100%
rename from test/zdtm/live/static/sleeping00.c
rename to test/zdtm/static/sleeping00.c
diff --git a/test/zdtm/live/static/sock_filter.c b/test/zdtm/static/sock_filter.c
similarity index 100%
rename from test/zdtm/live/static/sock_filter.c
rename to test/zdtm/static/sock_filter.c
diff --git a/test/zdtm/live/static/sock_opts00.c b/test/zdtm/static/sock_opts00.c
similarity index 100%
rename from test/zdtm/live/static/sock_opts00.c
rename to test/zdtm/static/sock_opts00.c
diff --git a/test/zdtm/live/static/sock_opts00.desc b/test/zdtm/static/sock_opts00.desc
similarity index 100%
rename from test/zdtm/live/static/sock_opts00.desc
rename to test/zdtm/static/sock_opts00.desc
diff --git a/test/zdtm/live/static/sock_opts01.c b/test/zdtm/static/sock_opts01.c
similarity index 100%
rename from test/zdtm/live/static/sock_opts01.c
rename to test/zdtm/static/sock_opts01.c
diff --git a/test/zdtm/live/static/sock_opts01.desc b/test/zdtm/static/sock_opts01.desc
similarity index 100%
rename from test/zdtm/live/static/sock_opts01.desc
rename to test/zdtm/static/sock_opts01.desc
diff --git a/test/zdtm/live/static/socket-closed-tcp.c b/test/zdtm/static/socket-closed-tcp.c
similarity index 100%
rename from test/zdtm/live/static/socket-closed-tcp.c
rename to test/zdtm/static/socket-closed-tcp.c
diff --git a/test/zdtm/live/static/socket-closed-tcp.desc b/test/zdtm/static/socket-closed-tcp.desc
similarity index 100%
rename from test/zdtm/live/static/socket-closed-tcp.desc
rename to test/zdtm/static/socket-closed-tcp.desc
diff --git a/test/zdtm/live/static/socket-ext.c b/test/zdtm/static/socket-ext.c
similarity index 100%
rename from test/zdtm/live/static/socket-ext.c
rename to test/zdtm/static/socket-ext.c
diff --git a/test/zdtm/live/static/socket-ext.desc b/test/zdtm/static/socket-ext.desc
similarity index 100%
rename from test/zdtm/live/static/socket-ext.desc
rename to test/zdtm/static/socket-ext.desc
diff --git a/test/zdtm/live/static/socket-ext.opts b/test/zdtm/static/socket-ext.opts
similarity index 100%
rename from test/zdtm/live/static/socket-ext.opts
rename to test/zdtm/static/socket-ext.opts
diff --git a/test/zdtm/live/static/socket-tcp-local.c b/test/zdtm/static/socket-tcp-local.c
similarity index 100%
rename from test/zdtm/live/static/socket-tcp-local.c
rename to test/zdtm/static/socket-tcp-local.c
diff --git a/test/zdtm/live/static/socket-tcp-local.desc b/test/zdtm/static/socket-tcp-local.desc
similarity index 100%
rename from test/zdtm/live/static/socket-tcp-local.desc
rename to test/zdtm/static/socket-tcp-local.desc
diff --git a/test/zdtm/live/static/socket-tcp-local.opts b/test/zdtm/static/socket-tcp-local.opts
similarity index 100%
rename from test/zdtm/live/static/socket-tcp-local.opts
rename to test/zdtm/static/socket-tcp-local.opts
diff --git a/test/zdtm/live/static/socket-tcp-nfconntrack.c b/test/zdtm/static/socket-tcp-nfconntrack.c
similarity index 100%
rename from test/zdtm/live/static/socket-tcp-nfconntrack.c
rename to test/zdtm/static/socket-tcp-nfconntrack.c
diff --git a/test/zdtm/live/static/socket-tcp-nfconntrack.desc b/test/zdtm/static/socket-tcp-nfconntrack.desc
similarity index 100%
rename from test/zdtm/live/static/socket-tcp-nfconntrack.desc
rename to test/zdtm/static/socket-tcp-nfconntrack.desc
diff --git a/test/zdtm/live/static/socket-tcp.c b/test/zdtm/static/socket-tcp.c
similarity index 100%
rename from test/zdtm/live/static/socket-tcp.c
rename to test/zdtm/static/socket-tcp.c
diff --git a/test/zdtm/live/static/socket-tcp.desc b/test/zdtm/static/socket-tcp.desc
similarity index 100%
rename from test/zdtm/live/static/socket-tcp.desc
rename to test/zdtm/static/socket-tcp.desc
diff --git a/test/zdtm/live/static/socket-tcp.opts b/test/zdtm/static/socket-tcp.opts
similarity index 100%
rename from test/zdtm/live/static/socket-tcp.opts
rename to test/zdtm/static/socket-tcp.opts
diff --git a/test/zdtm/live/static/socket-tcp6-local.c b/test/zdtm/static/socket-tcp6-local.c
similarity index 100%
rename from test/zdtm/live/static/socket-tcp6-local.c
rename to test/zdtm/static/socket-tcp6-local.c
diff --git a/test/zdtm/live/static/socket-tcp6-local.desc b/test/zdtm/static/socket-tcp6-local.desc
similarity index 100%
rename from test/zdtm/live/static/socket-tcp6-local.desc
rename to test/zdtm/static/socket-tcp6-local.desc
diff --git a/test/zdtm/live/static/socket-tcp6-local.opts b/test/zdtm/static/socket-tcp6-local.opts
similarity index 100%
rename from test/zdtm/live/static/socket-tcp6-local.opts
rename to test/zdtm/static/socket-tcp6-local.opts
diff --git a/test/zdtm/live/static/socket-tcp6.c b/test/zdtm/static/socket-tcp6.c
similarity index 100%
rename from test/zdtm/live/static/socket-tcp6.c
rename to test/zdtm/static/socket-tcp6.c
diff --git a/test/zdtm/live/static/socket-tcp6.desc b/test/zdtm/static/socket-tcp6.desc
similarity index 100%
rename from test/zdtm/live/static/socket-tcp6.desc
rename to test/zdtm/static/socket-tcp6.desc
diff --git a/test/zdtm/live/static/socket-tcp6.opts b/test/zdtm/static/socket-tcp6.opts
similarity index 100%
rename from test/zdtm/live/static/socket-tcp6.opts
rename to test/zdtm/static/socket-tcp6.opts
diff --git a/test/zdtm/live/static/socket-tcpbuf-local.c b/test/zdtm/static/socket-tcpbuf-local.c
similarity index 100%
rename from test/zdtm/live/static/socket-tcpbuf-local.c
rename to test/zdtm/static/socket-tcpbuf-local.c
diff --git a/test/zdtm/live/static/socket-tcpbuf-local.desc b/test/zdtm/static/socket-tcpbuf-local.desc
similarity index 100%
rename from test/zdtm/live/static/socket-tcpbuf-local.desc
rename to test/zdtm/static/socket-tcpbuf-local.desc
diff --git a/test/zdtm/live/static/socket-tcpbuf-local.opts b/test/zdtm/static/socket-tcpbuf-local.opts
similarity index 100%
rename from test/zdtm/live/static/socket-tcpbuf-local.opts
rename to test/zdtm/static/socket-tcpbuf-local.opts
diff --git a/test/zdtm/live/static/socket-tcpbuf.c b/test/zdtm/static/socket-tcpbuf.c
similarity index 100%
rename from test/zdtm/live/static/socket-tcpbuf.c
rename to test/zdtm/static/socket-tcpbuf.c
diff --git a/test/zdtm/live/static/socket-tcpbuf.desc b/test/zdtm/static/socket-tcpbuf.desc
similarity index 100%
rename from test/zdtm/live/static/socket-tcpbuf.desc
rename to test/zdtm/static/socket-tcpbuf.desc
diff --git a/test/zdtm/live/static/socket-tcpbuf.opts b/test/zdtm/static/socket-tcpbuf.opts
similarity index 100%
rename from test/zdtm/live/static/socket-tcpbuf.opts
rename to test/zdtm/static/socket-tcpbuf.opts
diff --git a/test/zdtm/live/static/socket-tcpbuf6-local.c b/test/zdtm/static/socket-tcpbuf6-local.c
similarity index 100%
rename from test/zdtm/live/static/socket-tcpbuf6-local.c
rename to test/zdtm/static/socket-tcpbuf6-local.c
diff --git a/test/zdtm/live/static/socket-tcpbuf6-local.desc b/test/zdtm/static/socket-tcpbuf6-local.desc
similarity index 100%
rename from test/zdtm/live/static/socket-tcpbuf6-local.desc
rename to test/zdtm/static/socket-tcpbuf6-local.desc
diff --git a/test/zdtm/live/static/socket-tcpbuf6-local.opts b/test/zdtm/static/socket-tcpbuf6-local.opts
similarity index 100%
rename from test/zdtm/live/static/socket-tcpbuf6-local.opts
rename to test/zdtm/static/socket-tcpbuf6-local.opts
diff --git a/test/zdtm/live/static/socket-tcpbuf6.c b/test/zdtm/static/socket-tcpbuf6.c
similarity index 100%
rename from test/zdtm/live/static/socket-tcpbuf6.c
rename to test/zdtm/static/socket-tcpbuf6.c
diff --git a/test/zdtm/live/static/socket-tcpbuf6.desc b/test/zdtm/static/socket-tcpbuf6.desc
similarity index 100%
rename from test/zdtm/live/static/socket-tcpbuf6.desc
rename to test/zdtm/static/socket-tcpbuf6.desc
diff --git a/test/zdtm/live/static/socket-tcpbuf6.opts b/test/zdtm/static/socket-tcpbuf6.opts
similarity index 100%
rename from test/zdtm/live/static/socket-tcpbuf6.opts
rename to test/zdtm/static/socket-tcpbuf6.opts
diff --git a/test/zdtm/live/static/socket6_udp.c b/test/zdtm/static/socket6_udp.c
similarity index 100%
rename from test/zdtm/live/static/socket6_udp.c
rename to test/zdtm/static/socket6_udp.c
diff --git a/test/zdtm/live/static/socket_aio.c b/test/zdtm/static/socket_aio.c
similarity index 100%
rename from test/zdtm/live/static/socket_aio.c
rename to test/zdtm/static/socket_aio.c
diff --git a/test/zdtm/live/static/socket_aio.desc b/test/zdtm/static/socket_aio.desc
similarity index 100%
rename from test/zdtm/live/static/socket_aio.desc
rename to test/zdtm/static/socket_aio.desc
diff --git a/test/zdtm/live/static/socket_close_data.c b/test/zdtm/static/socket_close_data.c
similarity index 100%
rename from test/zdtm/live/static/socket_close_data.c
rename to test/zdtm/static/socket_close_data.c
diff --git a/test/zdtm/live/static/socket_close_data01.c b/test/zdtm/static/socket_close_data01.c
similarity index 100%
rename from test/zdtm/live/static/socket_close_data01.c
rename to test/zdtm/static/socket_close_data01.c
diff --git a/test/zdtm/live/static/socket_dgram_data.c b/test/zdtm/static/socket_dgram_data.c
similarity index 100%
rename from test/zdtm/live/static/socket_dgram_data.c
rename to test/zdtm/static/socket_dgram_data.c
diff --git a/test/zdtm/live/static/socket_listen.c b/test/zdtm/static/socket_listen.c
similarity index 100%
rename from test/zdtm/live/static/socket_listen.c
rename to test/zdtm/static/socket_listen.c
diff --git a/test/zdtm/live/static/socket_listen6.c b/test/zdtm/static/socket_listen6.c
similarity index 100%
rename from test/zdtm/live/static/socket_listen6.c
rename to test/zdtm/static/socket_listen6.c
diff --git a/test/zdtm/live/static/socket_queues.c b/test/zdtm/static/socket_queues.c
similarity index 100%
rename from test/zdtm/live/static/socket_queues.c
rename to test/zdtm/static/socket_queues.c
diff --git a/test/zdtm/live/static/socket_snd_addr.c b/test/zdtm/static/socket_snd_addr.c
similarity index 100%
rename from test/zdtm/live/static/socket_snd_addr.c
rename to test/zdtm/static/socket_snd_addr.c
diff --git a/test/zdtm/live/static/socket_snd_addr.desc b/test/zdtm/static/socket_snd_addr.desc
similarity index 100%
rename from test/zdtm/live/static/socket_snd_addr.desc
rename to test/zdtm/static/socket_snd_addr.desc
diff --git a/test/zdtm/live/static/socket_udp.c b/test/zdtm/static/socket_udp.c
similarity index 100%
rename from test/zdtm/live/static/socket_udp.c
rename to test/zdtm/static/socket_udp.c
diff --git a/test/zdtm/live/static/socket_udplite.c b/test/zdtm/static/socket_udplite.c
similarity index 100%
rename from test/zdtm/live/static/socket_udplite.c
rename to test/zdtm/static/socket_udplite.c
diff --git a/test/zdtm/live/static/sockets00.c b/test/zdtm/static/sockets00.c
similarity index 100%
rename from test/zdtm/live/static/sockets00.c
rename to test/zdtm/static/sockets00.c
diff --git a/test/zdtm/live/static/sockets00.desc b/test/zdtm/static/sockets00.desc
similarity index 100%
rename from test/zdtm/live/static/sockets00.desc
rename to test/zdtm/static/sockets00.desc
diff --git a/test/zdtm/live/static/sockets01.c b/test/zdtm/static/sockets01.c
similarity index 100%
rename from test/zdtm/live/static/sockets01.c
rename to test/zdtm/static/sockets01.c
diff --git a/test/zdtm/live/static/sockets02.c b/test/zdtm/static/sockets02.c
similarity index 100%
rename from test/zdtm/live/static/sockets02.c
rename to test/zdtm/static/sockets02.c
diff --git a/test/zdtm/live/static/sockets_dgram.c b/test/zdtm/static/sockets_dgram.c
similarity index 100%
rename from test/zdtm/live/static/sockets_dgram.c
rename to test/zdtm/static/sockets_dgram.c
diff --git a/test/zdtm/live/static/sockets_spair.c b/test/zdtm/static/sockets_spair.c
similarity index 100%
rename from test/zdtm/live/static/sockets_spair.c
rename to test/zdtm/static/sockets_spair.c
diff --git a/test/zdtm/live/static/sse00.c b/test/zdtm/static/sse00.c
similarity index 100%
rename from test/zdtm/live/static/sse00.c
rename to test/zdtm/static/sse00.c
diff --git a/test/zdtm/live/static/sse00.desc b/test/zdtm/static/sse00.desc
similarity index 100%
rename from test/zdtm/live/static/sse00.desc
rename to test/zdtm/static/sse00.desc
diff --git a/test/zdtm/live/static/sse20.c b/test/zdtm/static/sse20.c
similarity index 100%
rename from test/zdtm/live/static/sse20.c
rename to test/zdtm/static/sse20.c
diff --git a/test/zdtm/live/static/sse20.desc b/test/zdtm/static/sse20.desc
similarity index 100%
rename from test/zdtm/live/static/sse20.desc
rename to test/zdtm/static/sse20.desc
diff --git a/test/zdtm/live/static/stopped.c b/test/zdtm/static/stopped.c
similarity index 100%
rename from test/zdtm/live/static/stopped.c
rename to test/zdtm/static/stopped.c
diff --git a/test/zdtm/live/static/stopped01.c b/test/zdtm/static/stopped01.c
similarity index 100%
rename from test/zdtm/live/static/stopped01.c
rename to test/zdtm/static/stopped01.c
diff --git a/test/zdtm/live/static/stopped02.c b/test/zdtm/static/stopped02.c
similarity index 100%
rename from test/zdtm/live/static/stopped02.c
rename to test/zdtm/static/stopped02.c
diff --git a/test/zdtm/live/static/stopped12.c b/test/zdtm/static/stopped12.c
similarity index 100%
rename from test/zdtm/live/static/stopped12.c
rename to test/zdtm/static/stopped12.c
diff --git a/test/zdtm/live/static/tempfs.c b/test/zdtm/static/tempfs.c
similarity index 100%
rename from test/zdtm/live/static/tempfs.c
rename to test/zdtm/static/tempfs.c
diff --git a/test/zdtm/live/static/tempfs.desc b/test/zdtm/static/tempfs.desc
similarity index 100%
rename from test/zdtm/live/static/tempfs.desc
rename to test/zdtm/static/tempfs.desc
diff --git a/test/zdtm/live/static/tempfs_ro.c b/test/zdtm/static/tempfs_ro.c
similarity index 100%
rename from test/zdtm/live/static/tempfs_ro.c
rename to test/zdtm/static/tempfs_ro.c
diff --git a/test/zdtm/live/static/tempfs_ro.desc b/test/zdtm/static/tempfs_ro.desc
similarity index 100%
rename from test/zdtm/live/static/tempfs_ro.desc
rename to test/zdtm/static/tempfs_ro.desc
diff --git a/test/zdtm/live/static/tempfs_subns.c b/test/zdtm/static/tempfs_subns.c
similarity index 100%
rename from test/zdtm/live/static/tempfs_subns.c
rename to test/zdtm/static/tempfs_subns.c
diff --git a/test/zdtm/live/static/tempfs_subns.desc b/test/zdtm/static/tempfs_subns.desc
similarity index 100%
rename from test/zdtm/live/static/tempfs_subns.desc
rename to test/zdtm/static/tempfs_subns.desc
diff --git a/test/zdtm/live/static/timerfd.c b/test/zdtm/static/timerfd.c
similarity index 100%
rename from test/zdtm/live/static/timerfd.c
rename to test/zdtm/static/timerfd.c
diff --git a/test/zdtm/live/static/timerfd.desc b/test/zdtm/static/timerfd.desc
similarity index 100%
rename from test/zdtm/live/static/timerfd.desc
rename to test/zdtm/static/timerfd.desc
diff --git a/test/zdtm/live/static/timers.c b/test/zdtm/static/timers.c
similarity index 100%
rename from test/zdtm/live/static/timers.c
rename to test/zdtm/static/timers.c
diff --git a/test/zdtm/live/static/tty00.c b/test/zdtm/static/tty00.c
similarity index 100%
rename from test/zdtm/live/static/tty00.c
rename to test/zdtm/static/tty00.c
diff --git a/test/zdtm/live/static/tty00.desc b/test/zdtm/static/tty00.desc
similarity index 100%
rename from test/zdtm/live/static/tty00.desc
rename to test/zdtm/static/tty00.desc
diff --git a/test/zdtm/live/static/tty02.c b/test/zdtm/static/tty02.c
similarity index 100%
rename from test/zdtm/live/static/tty02.c
rename to test/zdtm/static/tty02.c
diff --git a/test/zdtm/live/static/tty03.c b/test/zdtm/static/tty03.c
similarity index 100%
rename from test/zdtm/live/static/tty03.c
rename to test/zdtm/static/tty03.c
diff --git a/test/zdtm/live/static/tun.c b/test/zdtm/static/tun.c
similarity index 100%
rename from test/zdtm/live/static/tun.c
rename to test/zdtm/static/tun.c
diff --git a/test/zdtm/live/static/tun.desc b/test/zdtm/static/tun.desc
similarity index 100%
rename from test/zdtm/live/static/tun.desc
rename to test/zdtm/static/tun.desc
diff --git a/test/zdtm/live/static/umask00.c b/test/zdtm/static/umask00.c
similarity index 100%
rename from test/zdtm/live/static/umask00.c
rename to test/zdtm/static/umask00.c
diff --git a/test/zdtm/live/static/unbound_sock.c b/test/zdtm/static/unbound_sock.c
similarity index 100%
rename from test/zdtm/live/static/unbound_sock.c
rename to test/zdtm/static/unbound_sock.c
diff --git a/test/zdtm/live/static/unhashed_proc.c b/test/zdtm/static/unhashed_proc.c
similarity index 100%
rename from test/zdtm/live/static/unhashed_proc.c
rename to test/zdtm/static/unhashed_proc.c
diff --git a/test/zdtm/live/static/unhashed_proc.desc b/test/zdtm/static/unhashed_proc.desc
similarity index 100%
rename from test/zdtm/live/static/unhashed_proc.desc
rename to test/zdtm/static/unhashed_proc.desc
diff --git a/test/zdtm/live/static/unlink_fifo.c b/test/zdtm/static/unlink_fifo.c
similarity index 100%
rename from test/zdtm/live/static/unlink_fifo.c
rename to test/zdtm/static/unlink_fifo.c
diff --git a/test/zdtm/live/static/unlink_fifo_wronly.c b/test/zdtm/static/unlink_fifo_wronly.c
similarity index 100%
rename from test/zdtm/live/static/unlink_fifo_wronly.c
rename to test/zdtm/static/unlink_fifo_wronly.c
diff --git a/test/zdtm/live/static/unlink_fstat00.c b/test/zdtm/static/unlink_fstat00.c
similarity index 100%
rename from test/zdtm/live/static/unlink_fstat00.c
rename to test/zdtm/static/unlink_fstat00.c
diff --git a/test/zdtm/live/static/unlink_fstat00.hook b/test/zdtm/static/unlink_fstat00.hook
similarity index 100%
rename from test/zdtm/live/static/unlink_fstat00.hook
rename to test/zdtm/static/unlink_fstat00.hook
diff --git a/test/zdtm/live/static/unlink_fstat01+.c b/test/zdtm/static/unlink_fstat01+.c
similarity index 100%
rename from test/zdtm/live/static/unlink_fstat01+.c
rename to test/zdtm/static/unlink_fstat01+.c
diff --git a/test/zdtm/live/static/unlink_fstat01.c b/test/zdtm/static/unlink_fstat01.c
similarity index 100%
rename from test/zdtm/live/static/unlink_fstat01.c
rename to test/zdtm/static/unlink_fstat01.c
diff --git a/test/zdtm/live/static/unlink_fstat02.c b/test/zdtm/static/unlink_fstat02.c
similarity index 100%
rename from test/zdtm/live/static/unlink_fstat02.c
rename to test/zdtm/static/unlink_fstat02.c
diff --git a/test/zdtm/live/static/unlink_fstat03.c b/test/zdtm/static/unlink_fstat03.c
similarity index 100%
rename from test/zdtm/live/static/unlink_fstat03.c
rename to test/zdtm/static/unlink_fstat03.c
diff --git a/test/zdtm/live/static/unlink_fstat03.desc b/test/zdtm/static/unlink_fstat03.desc
similarity index 100%
rename from test/zdtm/live/static/unlink_fstat03.desc
rename to test/zdtm/static/unlink_fstat03.desc
diff --git a/test/zdtm/live/static/unlink_fstat03.opts b/test/zdtm/static/unlink_fstat03.opts
similarity index 100%
rename from test/zdtm/live/static/unlink_fstat03.opts
rename to test/zdtm/static/unlink_fstat03.opts
diff --git a/test/zdtm/live/static/unlink_largefile.c b/test/zdtm/static/unlink_largefile.c
similarity index 100%
rename from test/zdtm/live/static/unlink_largefile.c
rename to test/zdtm/static/unlink_largefile.c
diff --git a/test/zdtm/live/static/unlink_largefile.desc b/test/zdtm/static/unlink_largefile.desc
similarity index 100%
rename from test/zdtm/live/static/unlink_largefile.desc
rename to test/zdtm/static/unlink_largefile.desc
diff --git a/test/zdtm/live/static/unlink_mmap00.c b/test/zdtm/static/unlink_mmap00.c
similarity index 100%
rename from test/zdtm/live/static/unlink_mmap00.c
rename to test/zdtm/static/unlink_mmap00.c
diff --git a/test/zdtm/live/static/unlink_mmap00.desc b/test/zdtm/static/unlink_mmap00.desc
similarity index 100%
rename from test/zdtm/live/static/unlink_mmap00.desc
rename to test/zdtm/static/unlink_mmap00.desc
diff --git a/test/zdtm/live/static/unlink_mmap01.c b/test/zdtm/static/unlink_mmap01.c
similarity index 100%
rename from test/zdtm/live/static/unlink_mmap01.c
rename to test/zdtm/static/unlink_mmap01.c
diff --git a/test/zdtm/live/static/unlink_mmap01.desc b/test/zdtm/static/unlink_mmap01.desc
similarity index 100%
rename from test/zdtm/live/static/unlink_mmap01.desc
rename to test/zdtm/static/unlink_mmap01.desc
diff --git a/test/zdtm/live/static/unlink_mmap02.c b/test/zdtm/static/unlink_mmap02.c
similarity index 100%
rename from test/zdtm/live/static/unlink_mmap02.c
rename to test/zdtm/static/unlink_mmap02.c
diff --git a/test/zdtm/live/static/unlink_mmap02.desc b/test/zdtm/static/unlink_mmap02.desc
similarity index 100%
rename from test/zdtm/live/static/unlink_mmap02.desc
rename to test/zdtm/static/unlink_mmap02.desc
diff --git a/test/zdtm/live/static/unlink_regular00.c b/test/zdtm/static/unlink_regular00.c
similarity index 100%
rename from test/zdtm/live/static/unlink_regular00.c
rename to test/zdtm/static/unlink_regular00.c
diff --git a/test/zdtm/live/static/unlink_regular00.desc b/test/zdtm/static/unlink_regular00.desc
similarity index 100%
rename from test/zdtm/live/static/unlink_regular00.desc
rename to test/zdtm/static/unlink_regular00.desc
diff --git a/test/zdtm/live/static/uptime_grow.c b/test/zdtm/static/uptime_grow.c
similarity index 100%
rename from test/zdtm/live/static/uptime_grow.c
rename to test/zdtm/static/uptime_grow.c
diff --git a/test/zdtm/live/static/uptime_grow.desc b/test/zdtm/static/uptime_grow.desc
similarity index 100%
rename from test/zdtm/live/static/uptime_grow.desc
rename to test/zdtm/static/uptime_grow.desc
diff --git a/test/zdtm/live/static/utsname.c b/test/zdtm/static/utsname.c
similarity index 100%
rename from test/zdtm/live/static/utsname.c
rename to test/zdtm/static/utsname.c
diff --git a/test/zdtm/live/static/utsname.desc b/test/zdtm/static/utsname.desc
similarity index 100%
rename from test/zdtm/live/static/utsname.desc
rename to test/zdtm/static/utsname.desc
diff --git a/test/zdtm/live/static/vdso00.c b/test/zdtm/static/vdso00.c
similarity index 100%
rename from test/zdtm/live/static/vdso00.c
rename to test/zdtm/static/vdso00.c
diff --git a/test/zdtm/live/static/vdso01.c b/test/zdtm/static/vdso01.c
similarity index 100%
rename from test/zdtm/live/static/vdso01.c
rename to test/zdtm/static/vdso01.c
diff --git a/test/zdtm/live/static/vdso01.desc b/test/zdtm/static/vdso01.desc
similarity index 100%
rename from test/zdtm/live/static/vdso01.desc
rename to test/zdtm/static/vdso01.desc
diff --git a/test/zdtm/live/static/vfork00.c b/test/zdtm/static/vfork00.c
similarity index 100%
rename from test/zdtm/live/static/vfork00.c
rename to test/zdtm/static/vfork00.c
diff --git a/test/zdtm/live/static/vfork00.desc b/test/zdtm/static/vfork00.desc
similarity index 100%
rename from test/zdtm/live/static/vfork00.desc
rename to test/zdtm/static/vfork00.desc
diff --git a/test/zdtm/live/static/vsx.c b/test/zdtm/static/vsx.c
similarity index 100%
rename from test/zdtm/live/static/vsx.c
rename to test/zdtm/static/vsx.c
diff --git a/test/zdtm/live/static/vsx.desc b/test/zdtm/static/vsx.desc
similarity index 100%
rename from test/zdtm/live/static/vsx.desc
rename to test/zdtm/static/vsx.desc
diff --git a/test/zdtm/live/static/vt.c b/test/zdtm/static/vt.c
similarity index 100%
rename from test/zdtm/live/static/vt.c
rename to test/zdtm/static/vt.c
diff --git a/test/zdtm/live/static/vt.desc b/test/zdtm/static/vt.desc
similarity index 100%
rename from test/zdtm/live/static/vt.desc
rename to test/zdtm/static/vt.desc
diff --git a/test/zdtm/live/static/wait00.c b/test/zdtm/static/wait00.c
similarity index 100%
rename from test/zdtm/live/static/wait00.c
rename to test/zdtm/static/wait00.c
diff --git a/test/zdtm/live/static/write_read00.c b/test/zdtm/static/write_read00.c
similarity index 100%
rename from test/zdtm/live/static/write_read00.c
rename to test/zdtm/static/write_read00.c
diff --git a/test/zdtm/live/static/write_read01.c b/test/zdtm/static/write_read01.c
similarity index 100%
rename from test/zdtm/live/static/write_read01.c
rename to test/zdtm/static/write_read01.c
diff --git a/test/zdtm/live/static/write_read02.c b/test/zdtm/static/write_read02.c
similarity index 100%
rename from test/zdtm/live/static/write_read02.c
rename to test/zdtm/static/write_read02.c
diff --git a/test/zdtm/live/static/write_read10.c b/test/zdtm/static/write_read10.c
similarity index 100%
rename from test/zdtm/live/static/write_read10.c
rename to test/zdtm/static/write_read10.c
diff --git a/test/zdtm/live/static/xids00.c b/test/zdtm/static/xids00.c
similarity index 100%
rename from test/zdtm/live/static/xids00.c
rename to test/zdtm/static/xids00.c
diff --git a/test/zdtm/live/static/zombie00.c b/test/zdtm/static/zombie00.c
similarity index 100%
rename from test/zdtm/live/static/zombie00.c
rename to test/zdtm/static/zombie00.c
diff --git a/test/zdtm/live/transition/Makefile b/test/zdtm/transition/Makefile
similarity index 97%
rename from test/zdtm/live/transition/Makefile
rename to test/zdtm/transition/Makefile
index 256d1161d..f0cad38c8 100644
--- a/test/zdtm/live/transition/Makefile
+++ b/test/zdtm/transition/Makefile
@@ -1,6 +1,6 @@
-include ../../Makefile.inc
+include ../Makefile.inc
 
-LIBDIR	= ../../lib
+LIBDIR	= ../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
 override CPPFLAGS += -I$(LIBDIR)
 CFLAGS	= -g -O2 -Wall -Werror -fno-strict-aliasing
diff --git a/test/zdtm/live/transition/epoll.c b/test/zdtm/transition/epoll.c
similarity index 100%
rename from test/zdtm/live/transition/epoll.c
rename to test/zdtm/transition/epoll.c
diff --git a/test/zdtm/live/transition/epoll.desc b/test/zdtm/transition/epoll.desc
similarity index 100%
rename from test/zdtm/live/transition/epoll.desc
rename to test/zdtm/transition/epoll.desc
diff --git a/test/zdtm/live/transition/fifo_dyn.c b/test/zdtm/transition/fifo_dyn.c
similarity index 100%
rename from test/zdtm/live/transition/fifo_dyn.c
rename to test/zdtm/transition/fifo_dyn.c
diff --git a/test/zdtm/live/transition/fifo_dyn.desc b/test/zdtm/transition/fifo_dyn.desc
similarity index 100%
rename from test/zdtm/live/transition/fifo_dyn.desc
rename to test/zdtm/transition/fifo_dyn.desc
diff --git a/test/zdtm/live/transition/fifo_loop.c b/test/zdtm/transition/fifo_loop.c
similarity index 100%
rename from test/zdtm/live/transition/fifo_loop.c
rename to test/zdtm/transition/fifo_loop.c
diff --git a/test/zdtm/live/transition/fifo_loop.desc b/test/zdtm/transition/fifo_loop.desc
similarity index 100%
rename from test/zdtm/live/transition/fifo_loop.desc
rename to test/zdtm/transition/fifo_loop.desc
diff --git a/test/zdtm/live/transition/file_aio.c b/test/zdtm/transition/file_aio.c
similarity index 100%
rename from test/zdtm/live/transition/file_aio.c
rename to test/zdtm/transition/file_aio.c
diff --git a/test/zdtm/live/transition/file_aio.desc b/test/zdtm/transition/file_aio.desc
similarity index 100%
rename from test/zdtm/live/transition/file_aio.desc
rename to test/zdtm/transition/file_aio.desc
diff --git a/test/zdtm/live/transition/file_read.c b/test/zdtm/transition/file_read.c
similarity index 100%
rename from test/zdtm/live/transition/file_read.c
rename to test/zdtm/transition/file_read.c
diff --git a/test/zdtm/live/transition/fork.c b/test/zdtm/transition/fork.c
similarity index 100%
rename from test/zdtm/live/transition/fork.c
rename to test/zdtm/transition/fork.c
diff --git a/test/zdtm/live/transition/fork2.c b/test/zdtm/transition/fork2.c
similarity index 100%
rename from test/zdtm/live/transition/fork2.c
rename to test/zdtm/transition/fork2.c
diff --git a/test/zdtm/live/transition/ipc.c b/test/zdtm/transition/ipc.c
similarity index 100%
rename from test/zdtm/live/transition/ipc.c
rename to test/zdtm/transition/ipc.c
diff --git a/test/zdtm/live/transition/ipc.desc b/test/zdtm/transition/ipc.desc
similarity index 100%
rename from test/zdtm/live/transition/ipc.desc
rename to test/zdtm/transition/ipc.desc
diff --git a/test/zdtm/live/transition/maps007.c b/test/zdtm/transition/maps007.c
similarity index 100%
rename from test/zdtm/live/transition/maps007.c
rename to test/zdtm/transition/maps007.c
diff --git a/test/zdtm/live/transition/maps007.desc b/test/zdtm/transition/maps007.desc
similarity index 100%
rename from test/zdtm/live/transition/maps007.desc
rename to test/zdtm/transition/maps007.desc
diff --git a/test/zdtm/live/transition/netlink00.c b/test/zdtm/transition/netlink00.c
similarity index 100%
rename from test/zdtm/live/transition/netlink00.c
rename to test/zdtm/transition/netlink00.c
diff --git a/test/zdtm/live/transition/netlink00.desc b/test/zdtm/transition/netlink00.desc
similarity index 100%
rename from test/zdtm/live/transition/netlink00.desc
rename to test/zdtm/transition/netlink00.desc
diff --git a/test/zdtm/live/transition/pipe_loop00.c b/test/zdtm/transition/pipe_loop00.c
similarity index 100%
rename from test/zdtm/live/transition/pipe_loop00.c
rename to test/zdtm/transition/pipe_loop00.c
diff --git a/test/zdtm/live/transition/pipe_shared00.c b/test/zdtm/transition/pipe_shared00.c
similarity index 100%
rename from test/zdtm/live/transition/pipe_shared00.c
rename to test/zdtm/transition/pipe_shared00.c
diff --git a/test/zdtm/live/transition/ptrace.c b/test/zdtm/transition/ptrace.c
similarity index 100%
rename from test/zdtm/live/transition/ptrace.c
rename to test/zdtm/transition/ptrace.c
diff --git a/test/zdtm/live/transition/ptrace.desc b/test/zdtm/transition/ptrace.desc
similarity index 100%
rename from test/zdtm/live/transition/ptrace.desc
rename to test/zdtm/transition/ptrace.desc
diff --git a/test/zdtm/live/transition/socket-tcp.c b/test/zdtm/transition/socket-tcp.c
similarity index 100%
rename from test/zdtm/live/transition/socket-tcp.c
rename to test/zdtm/transition/socket-tcp.c
diff --git a/test/zdtm/live/transition/socket-tcp.desc b/test/zdtm/transition/socket-tcp.desc
similarity index 100%
rename from test/zdtm/live/transition/socket-tcp.desc
rename to test/zdtm/transition/socket-tcp.desc
diff --git a/test/zdtm/live/transition/socket-tcp.opts b/test/zdtm/transition/socket-tcp.opts
similarity index 100%
rename from test/zdtm/live/transition/socket-tcp.opts
rename to test/zdtm/transition/socket-tcp.opts
diff --git a/test/zdtm/live/transition/socket-tcp6.c b/test/zdtm/transition/socket-tcp6.c
similarity index 100%
rename from test/zdtm/live/transition/socket-tcp6.c
rename to test/zdtm/transition/socket-tcp6.c
diff --git a/test/zdtm/live/transition/socket-tcp6.desc b/test/zdtm/transition/socket-tcp6.desc
similarity index 100%
rename from test/zdtm/live/transition/socket-tcp6.desc
rename to test/zdtm/transition/socket-tcp6.desc
diff --git a/test/zdtm/live/transition/socket-tcp6.opts b/test/zdtm/transition/socket-tcp6.opts
similarity index 100%
rename from test/zdtm/live/transition/socket-tcp6.opts
rename to test/zdtm/transition/socket-tcp6.opts
diff --git a/test/zdtm/live/transition/socket_loop00.c b/test/zdtm/transition/socket_loop00.c
similarity index 100%
rename from test/zdtm/live/transition/socket_loop00.c
rename to test/zdtm/transition/socket_loop00.c
diff --git a/test/zdtm/live/transition/socket_loop00.desc b/test/zdtm/transition/socket_loop00.desc
similarity index 100%
rename from test/zdtm/live/transition/socket_loop00.desc
rename to test/zdtm/transition/socket_loop00.desc
diff --git a/test/zdtm/live/transition/thread-bomb.c b/test/zdtm/transition/thread-bomb.c
similarity index 100%
rename from test/zdtm/live/transition/thread-bomb.c
rename to test/zdtm/transition/thread-bomb.c
diff --git a/test/zdtm/live/transition/thread-bomb.desc b/test/zdtm/transition/thread-bomb.desc
similarity index 100%
rename from test/zdtm/live/transition/thread-bomb.desc
rename to test/zdtm/transition/thread-bomb.desc
diff --git a/test/zdtm/live/transition/unix_sock.c b/test/zdtm/transition/unix_sock.c
similarity index 100%
rename from test/zdtm/live/transition/unix_sock.c
rename to test/zdtm/transition/unix_sock.c
diff --git a/test/zdtm/live/transition/unix_sock.desc b/test/zdtm/transition/unix_sock.desc
similarity index 100%
rename from test/zdtm/live/transition/unix_sock.desc
rename to test/zdtm/transition/unix_sock.desc