diff --git a/test/zdtm.sh b/test/zdtm.sh
index 1b89be7df..bd2c2f1e7 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -174,9 +174,6 @@ static/netns
 static/cgroup00
 static/cgroup01
 ns/static/clean_mntns
-ns/static/mntns_open
-ns/static/mntns_link_remap
-ns/static/mntns_link_ghost
 "
 
 TEST_CR_KERNEL="
@@ -184,6 +181,18 @@ ns/static/tun
 static/timerfd
 "
 
+cat /proc/self/fdinfo/1 | grep -q mnt_id
+if [ $? -eq 0 ]; then
+	TEST_LIST="$TEST_LIST
+ns/static/mntns_open
+ns/static/mntns_link_remap
+ns/static/mntns_link_ghost
+"
+else
+	export ZDTM_NOSUBNS=1
+fi
+
+
 TEST_SUID_LIST="
 pid00
 caps00
@@ -237,8 +246,6 @@ START_ONLY=0
 BATCH_TEST=0
 SPECIFIED_NAME_USED=0
 
-cat /proc/self/fdinfo/1 | grep -q mnt_id || export ZDTM_NOSUBNS=1
-
 zdtm_sep()
 { (
 	set +x