diff --git a/test/zdtm/static/cow00.desc b/test/zdtm/static/cow00.desc
index 95c58b401..c303c117c 100644
--- a/test/zdtm/static/cow00.desc
+++ b/test/zdtm/static/cow00.desc
@@ -1 +1,2 @@
-{'flags': 'noauto'}
+# /proc/pid/pagemap doesn't show phys addr for unprivileged users
+{'flavor': 'ns h', 'flags': 'suid'}
diff --git a/test/zdtm/static/pty02.desc b/test/zdtm/static/pty02.desc
deleted file mode 100644
index 95c58b401..000000000
--- a/test/zdtm/static/pty02.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}
diff --git a/test/zdtm/static/socket_aio.desc b/test/zdtm/static/socket_aio.desc
index 95c58b401..6b0e5a369 100644
--- a/test/zdtm/static/socket_aio.desc
+++ b/test/zdtm/static/socket_aio.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'opts': '--tcp-established'}
diff --git a/test/zdtm/static/tty00.desc b/test/zdtm/static/tty00.desc
deleted file mode 100644
index 95c58b401..000000000
--- a/test/zdtm/static/tty00.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}
diff --git a/test/zdtm/transition/epoll.desc b/test/zdtm/transition/epoll.desc
deleted file mode 100644
index 95c58b401..000000000
--- a/test/zdtm/transition/epoll.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}
diff --git a/test/zdtm/transition/fifo_loop.desc b/test/zdtm/transition/fifo_loop.desc
deleted file mode 100644
index 95c58b401..000000000
--- a/test/zdtm/transition/fifo_loop.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}
diff --git a/test/zdtm/transition/file_aio.desc b/test/zdtm/transition/file_aio.desc
deleted file mode 100644
index 95c58b401..000000000
--- a/test/zdtm/transition/file_aio.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}
diff --git a/test/zdtm/transition/socket_loop00.desc b/test/zdtm/transition/socket_loop00.desc
deleted file mode 100644
index 95c58b401..000000000
--- a/test/zdtm/transition/socket_loop00.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}
diff --git a/test/zdtm/transition/unix_sock.desc b/test/zdtm/transition/unix_sock.desc
deleted file mode 100644
index 95c58b401..000000000
--- a/test/zdtm/transition/unix_sock.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}