diff --git a/test/zdtm/static/overmount_dev.desc b/test/zdtm/static/overmount_dev.desc
index 95c58b401..c739fc950 100644
--- a/test/zdtm/static/overmount_dev.desc
+++ b/test/zdtm/static/overmount_dev.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flavor' : "ns", 'flags': 'suid crfail'}
diff --git a/test/zdtm/static/overmount_fifo.desc b/test/zdtm/static/overmount_fifo.desc
index 95c58b401..1ba68c314 100644
--- a/test/zdtm/static/overmount_fifo.desc
+++ b/test/zdtm/static/overmount_fifo.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flavor' : 'ns uns', 'flags': 'suid crfail'}
diff --git a/test/zdtm/static/overmount_file.desc b/test/zdtm/static/overmount_file.desc
index 95c58b401..1ba68c314 100644
--- a/test/zdtm/static/overmount_file.desc
+++ b/test/zdtm/static/overmount_file.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flavor' : 'ns uns', 'flags': 'suid crfail'}
diff --git a/test/zdtm/static/overmount_sock.desc b/test/zdtm/static/overmount_sock.desc
index 95c58b401..1ba68c314 100644
--- a/test/zdtm/static/overmount_sock.desc
+++ b/test/zdtm/static/overmount_sock.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flavor' : 'ns uns', 'flags': 'suid crfail'}
diff --git a/test/zdtm/static/socket-closed-tcp.desc b/test/zdtm/static/socket-closed-tcp.desc
index 95c58b401..ded89879a 100644
--- a/test/zdtm/static/socket-closed-tcp.desc
+++ b/test/zdtm/static/socket-closed-tcp.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flags': 'crfail'}
diff --git a/test/zdtm/static/unhashed_proc.desc b/test/zdtm/static/unhashed_proc.desc
index 95c58b401..847e3b27c 100644
--- a/test/zdtm/static/unhashed_proc.desc
+++ b/test/zdtm/static/unhashed_proc.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flags': 'crfail', 'opts' : '--link-remap'}
diff --git a/test/zdtm/static/unlink_largefile.desc b/test/zdtm/static/unlink_largefile.desc
index 95c58b401..ded89879a 100644
--- a/test/zdtm/static/unlink_largefile.desc
+++ b/test/zdtm/static/unlink_largefile.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flags': 'crfail'}
diff --git a/test/zdtm/static/unlink_regular00.desc b/test/zdtm/static/unlink_regular00.desc
index 53aea561b..e49bbfbc1 100644
--- a/test/zdtm/static/unlink_regular00.desc
+++ b/test/zdtm/static/unlink_regular00.desc
@@ -1 +1 @@
-{'flavor': 'ns', 'flags': 'suid noauto'}
+{'flavor': 'ns', 'flags': 'suid crfail'}