204 files changed, 204 insertions, 204 deletions

diff --git a/cfg.mk b/cfg.mk
index a6d414cd7..92f119ee2 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -346,7 +346,7 @@ FILTER_LONG_LINES =						\
   \|^[^:]*NEWS:.*https\{,1\}://| d;					\
   \|^[^:]*doc/fdl.texi:| d;					\
   \|^[^:]*man/help2man:| d;					\
-  \|^[^:]*tests/misc/sha[0-9]*sum.*\.pl[-:]| d;			\
+  \|^[^:]*tests/cksum/sha[0-9]*sum.*\.pl[-:]| d;			\
   \|^[^:]*tests/pr/|{ \|^[^:]*tests/pr/pr-tests:| !d; };
 sc_long_lines:
 	@wc -L /dev/null >/dev/null 2>/dev/null				\
@@ -888,7 +888,7 @@ exclude_file_name_regexp--sc_prohibit_stat_st_blocks = \
 exclude_file_name_regexp--sc_prohibit_continued_string_alpha_in_column_1 = \
   ^src/(system\.h|od\.c|printf\.c|getlimits\.c)$$
 
-_cksum = ^tests/misc/cksum-base64\.pl$$
+_cksum = ^tests/cksum/cksum-base64\.pl$$
 exclude_file_name_regexp--sc_prohibit_test_backticks = \
   ^tests/(local\.mk|(init|misc/stdbuf|factor/create-test)\.sh)$$|$(_cksum)
 
diff --git a/tests/misc/cat-E.sh b/tests/cat/cat-E.sh
index 28c02c1d9..28c02c1d9 100755
--- a/tests/misc/cat-E.sh
+++ b/tests/cat/cat-E.sh
diff --git a/tests/misc/cat-buf.sh b/tests/cat/cat-buf.sh
index c8bd69758..c8bd69758 100755
--- a/tests/misc/cat-buf.sh
+++ b/tests/cat/cat-buf.sh
diff --git a/tests/misc/cat-proc.sh b/tests/cat/cat-proc.sh
index b5b0e5726..b5b0e5726 100755
--- a/tests/misc/cat-proc.sh
+++ b/tests/cat/cat-proc.sh
diff --git a/tests/misc/cat-self.sh b/tests/cat/cat-self.sh
index ff2afdcf4..ff2afdcf4 100755
--- a/tests/misc/cat-self.sh
+++ b/tests/cat/cat-self.sh
diff --git a/tests/misc/chcon-fail.sh b/tests/chcon/chcon-fail.sh
index e70417d79..e70417d79 100755
--- a/tests/misc/chcon-fail.sh
+++ b/tests/chcon/chcon-fail.sh
diff --git a/tests/misc/chcon.sh b/tests/chcon/chcon.sh
index 7028a95e1..7028a95e1 100755
--- a/tests/misc/chcon.sh
+++ b/tests/chcon/chcon.sh
diff --git a/tests/misc/chroot-credentials.sh b/tests/chroot/chroot-credentials.sh
index 19f42197d..19f42197d 100755
--- a/tests/misc/chroot-credentials.sh
+++ b/tests/chroot/chroot-credentials.sh
diff --git a/tests/misc/chroot-fail.sh b/tests/chroot/chroot-fail.sh
index e5d671efd..e5d671efd 100755
--- a/tests/misc/chroot-fail.sh
+++ b/tests/chroot/chroot-fail.sh
diff --git a/tests/misc/b2sum.sh b/tests/cksum/b2sum.sh
index 6a2d13024..6a2d13024 100755
--- a/tests/misc/b2sum.sh
+++ b/tests/cksum/b2sum.sh
diff --git a/tests/misc/cksum-a.sh b/tests/cksum/cksum-a.sh
index 712c7ff16..712c7ff16 100755
--- a/tests/misc/cksum-a.sh
+++ b/tests/cksum/cksum-a.sh
diff --git a/tests/misc/cksum-base64.pl b/tests/cksum/cksum-base64.pl
index 4fec7a5d7..4fec7a5d7 100755
--- a/tests/misc/cksum-base64.pl
+++ b/tests/cksum/cksum-base64.pl
diff --git a/tests/misc/cksum-c.sh b/tests/cksum/cksum-c.sh
index d645c1b32..d645c1b32 100755
--- a/tests/misc/cksum-c.sh
+++ b/tests/cksum/cksum-c.sh
diff --git a/tests/misc/cksum-raw.sh b/tests/cksum/cksum-raw.sh
index a5f14be88..a5f14be88 100755
--- a/tests/misc/cksum-raw.sh
+++ b/tests/cksum/cksum-raw.sh
diff --git a/tests/misc/cksum.sh b/tests/cksum/cksum.sh
index 21869fa7a..21869fa7a 100755
--- a/tests/misc/cksum.sh
+++ b/tests/cksum/cksum.sh
diff --git a/tests/misc/md5sum-bsd.sh b/tests/cksum/md5sum-bsd.sh
index 5fe9b2fc9..5fe9b2fc9 100755
--- a/tests/misc/md5sum-bsd.sh
+++ b/tests/cksum/md5sum-bsd.sh
diff --git a/tests/misc/md5sum-newline.pl b/tests/cksum/md5sum-newline.pl
index feaebb49e..feaebb49e 100755
--- a/tests/misc/md5sum-newline.pl
+++ b/tests/cksum/md5sum-newline.pl
diff --git a/tests/misc/md5sum-parallel.sh b/tests/cksum/md5sum-parallel.sh
index 99da9ad6b..99da9ad6b 100755
--- a/tests/misc/md5sum-parallel.sh
+++ b/tests/cksum/md5sum-parallel.sh
diff --git a/tests/misc/md5sum.pl b/tests/cksum/md5sum.pl
index d712664b2..d712664b2 100755
--- a/tests/misc/md5sum.pl
+++ b/tests/cksum/md5sum.pl
diff --git a/tests/misc/sha1sum-vec.pl b/tests/cksum/sha1sum-vec.pl
index 7fed5fe37..7fed5fe37 100755
--- a/tests/misc/sha1sum-vec.pl
+++ b/tests/cksum/sha1sum-vec.pl
diff --git a/tests/misc/sha1sum.pl b/tests/cksum/sha1sum.pl
index 40675cf7d..40675cf7d 100755
--- a/tests/misc/sha1sum.pl
+++ b/tests/cksum/sha1sum.pl
diff --git a/tests/misc/sha224sum.pl b/tests/cksum/sha224sum.pl
index 62710d7d2..62710d7d2 100755
--- a/tests/misc/sha224sum.pl
+++ b/tests/cksum/sha224sum.pl
diff --git a/tests/misc/sha256sum.pl b/tests/cksum/sha256sum.pl
index 7fa0b8a20..7fa0b8a20 100755
--- a/tests/misc/sha256sum.pl
+++ b/tests/cksum/sha256sum.pl
diff --git a/tests/misc/sha384sum.pl b/tests/cksum/sha384sum.pl
index dd0b1c95c..dd0b1c95c 100755
--- a/tests/misc/sha384sum.pl
+++ b/tests/cksum/sha384sum.pl
diff --git a/tests/misc/sha512sum.pl b/tests/cksum/sha512sum.pl
index 8cabe368e..8cabe368e 100755
--- a/tests/misc/sha512sum.pl
+++ b/tests/cksum/sha512sum.pl
diff --git a/tests/misc/sm3sum.pl b/tests/cksum/sm3sum.pl
index 3872fface..3872fface 100755
--- a/tests/misc/sm3sum.pl
+++ b/tests/cksum/sm3sum.pl
diff --git a/tests/misc/sum-sysv.sh b/tests/cksum/sum-sysv.sh
index bb3919012..bb3919012 100755
--- a/tests/misc/sum-sysv.sh
+++ b/tests/cksum/sum-sysv.sh
diff --git a/tests/misc/sum.pl b/tests/cksum/sum.pl
index abcecbc7f..abcecbc7f 100755
--- a/tests/misc/sum.pl
+++ b/tests/cksum/sum.pl
diff --git a/tests/misc/csplit-1000.sh b/tests/csplit/csplit-1000.sh
index bc34a24ea..bc34a24ea 100755
--- a/tests/misc/csplit-1000.sh
+++ b/tests/csplit/csplit-1000.sh
diff --git a/tests/misc/csplit-heap.sh b/tests/csplit/csplit-heap.sh
index 36b286b93..36b286b93 100755
--- a/tests/misc/csplit-heap.sh
+++ b/tests/csplit/csplit-heap.sh
diff --git a/tests/misc/csplit-io-err.sh b/tests/csplit/csplit-io-err.sh
index 04c0ce003..04c0ce003 100755
--- a/tests/misc/csplit-io-err.sh
+++ b/tests/csplit/csplit-io-err.sh
diff --git a/tests/misc/csplit-suppress-matched.pl b/tests/csplit/csplit-suppress-matched.pl
index b2c1a7039..b2c1a7039 100755
--- a/tests/misc/csplit-suppress-matched.pl
+++ b/tests/csplit/csplit-suppress-matched.pl
diff --git a/tests/misc/csplit.sh b/tests/csplit/csplit.sh
index a27f61eac..a27f61eac 100755
--- a/tests/misc/csplit.sh
+++ b/tests/csplit/csplit.sh
diff --git a/tests/misc/cut-huge-range.sh b/tests/cut/cut-huge-range.sh
index 453108cea..453108cea 100755
--- a/tests/misc/cut-huge-range.sh
+++ b/tests/cut/cut-huge-range.sh
diff --git a/tests/misc/cut.pl b/tests/cut/cut.pl
index 2e019078d..2e019078d 100755
--- a/tests/misc/cut.pl
+++ b/tests/cut/cut.pl
diff --git a/tests/misc/date-debug.sh b/tests/date/date-debug.sh
index f9e42f947..f9e42f947 100755
--- a/tests/misc/date-debug.sh
+++ b/tests/date/date-debug.sh
diff --git a/tests/misc/date-next-dow.pl b/tests/date/date-next-dow.pl
index ec414c788..ec414c788 100755
--- a/tests/misc/date-next-dow.pl
+++ b/tests/date/date-next-dow.pl
diff --git a/tests/misc/date-sec.sh b/tests/date/date-sec.sh
index f18590e6b..f18590e6b 100755
--- a/tests/misc/date-sec.sh
+++ b/tests/date/date-sec.sh
diff --git a/tests/misc/date-tz.sh b/tests/date/date-tz.sh
index f6cf071ba..f6cf071ba 100755
--- a/tests/misc/date-tz.sh
+++ b/tests/date/date-tz.sh
diff --git a/tests/misc/date.pl b/tests/date/date.pl
index d18f8b1eb..d18f8b1eb 100755
--- a/tests/misc/date.pl
+++ b/tests/date/date.pl
diff --git a/tests/misc/env-S-script.sh b/tests/env/env-S-script.sh
index 1d9b3e268..1d9b3e268 100755
--- a/tests/misc/env-S-script.sh
+++ b/tests/env/env-S-script.sh
diff --git a/tests/misc/env-S.pl b/tests/env/env-S.pl
index ad5e7ae00..ad5e7ae00 100755
--- a/tests/misc/env-S.pl
+++ b/tests/env/env-S.pl
diff --git a/tests/misc/env-null.sh b/tests/env/env-null.sh
index fac66754c..fac66754c 100755
--- a/tests/misc/env-null.sh
+++ b/tests/env/env-null.sh
diff --git a/tests/misc/env-signal-handler.sh b/tests/env/env-signal-handler.sh
index 7fc7fd635..7fc7fd635 100755
--- a/tests/misc/env-signal-handler.sh
+++ b/tests/env/env-signal-handler.sh
diff --git a/tests/misc/env.sh b/tests/env/env.sh
index 25241afc5..25241afc5 100755
--- a/tests/misc/env.sh
+++ b/tests/env/env.sh
diff --git a/tests/misc/expr-multibyte.pl b/tests/expr/expr-multibyte.pl
index d6703518f..d6703518f 100755
--- a/tests/misc/expr-multibyte.pl
+++ b/tests/expr/expr-multibyte.pl
diff --git a/tests/misc/expr.pl b/tests/expr/expr.pl
index f4863b109..f4863b109 100755
--- a/tests/misc/expr.pl
+++ b/tests/expr/expr.pl
diff --git a/tests/misc/factor-parallel.sh b/tests/factor/factor-parallel.sh
index 9a3d62ac1..9a3d62ac1 100755
--- a/tests/misc/factor-parallel.sh
+++ b/tests/factor/factor-parallel.sh
diff --git a/tests/misc/factor.pl b/tests/factor/factor.pl
index 6e612e418..6e612e418 100755
--- a/tests/misc/factor.pl
+++ b/tests/factor/factor.pl
diff --git a/tests/misc/groups-dash.sh b/tests/groups/groups-dash.sh
index a979bc8d6..a979bc8d6 100755
--- a/tests/misc/groups-dash.sh
+++ b/tests/groups/groups-dash.sh
diff --git a/tests/misc/groups-process-all.sh b/tests/groups/groups-process-all.sh
index 2e455c78a..2e455c78a 100755
--- a/tests/misc/groups-process-all.sh
+++ b/tests/groups/groups-process-all.sh
diff --git a/tests/misc/groups-version.sh b/tests/groups/groups-version.sh
index c177e3225..c177e3225 100755
--- a/tests/misc/groups-version.sh
+++ b/tests/groups/groups-version.sh
diff --git a/tests/misc/head-c.sh b/tests/head/head-c.sh
index 052caa73d..052caa73d 100755
--- a/tests/misc/head-c.sh
+++ b/tests/head/head-c.sh
diff --git a/tests/misc/head-elide-tail.pl b/tests/head/head-elide-tail.pl
index 221b45a80..221b45a80 100755
--- a/tests/misc/head-elide-tail.pl
+++ b/tests/head/head-elide-tail.pl
diff --git a/tests/misc/head-pos.sh b/tests/head/head-pos.sh
index c24edd161..c24edd161 100755
--- a/tests/misc/head-pos.sh
+++ b/tests/head/head-pos.sh
diff --git a/tests/misc/head-write-error.sh b/tests/head/head-write-error.sh
index 25cebe100..25cebe100 100755
--- a/tests/misc/head-write-error.sh
+++ b/tests/head/head-write-error.sh
diff --git a/tests/misc/head.pl b/tests/head/head.pl
index 56a1b3582..56a1b3582 100755
--- a/tests/misc/head.pl
+++ b/tests/head/head.pl
diff --git a/tests/misc/help-version-getopt.sh b/tests/help/help-version-getopt.sh
index 6e61b0f63..6e61b0f63 100755
--- a/tests/misc/help-version-getopt.sh
+++ b/tests/help/help-version-getopt.sh
diff --git a/tests/misc/help-version.sh b/tests/help/help-version.sh
index f0ef47518..f0ef47518 100755
--- a/tests/misc/help-version.sh
+++ b/tests/help/help-version.sh
diff --git a/tests/local.mk b/tests/local.mk
index 23a518a22..cc65fe656 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -124,10 +124,10 @@ all_root_tests =				\
   tests/install/install-C-root.sh		\
   tests/ls/capability.sh			\
   tests/ls/nameless-uid.sh			\
-  tests/misc/chcon.sh				\
-  tests/misc/chroot-credentials.sh		\
+  tests/chcon/chcon.sh				\
+  tests/chroot/chroot-credentials.sh		\
   tests/misc/selinux.sh				\
-  tests/misc/truncate-owned-by-other.sh		\
+  tests/truncate/truncate-owned-by-other.sh	\
   tests/mkdir/writable-under-readonly.sh	\
   tests/mkdir/smack-root.sh			\
   tests/mv/hardlink-case.sh			\
@@ -137,8 +137,8 @@ all_root_tests =				\
   tests/rm/one-file-system.sh			\
   tests/rm/read-only.sh				\
   tests/rm/empty-immutable-skip.sh		\
-  tests/tail-2/append-only.sh			\
-  tests/tail-2/end-of-device.sh			\
+  tests/tail/append-only.sh			\
+  tests/tail/end-of-device.sh			\
   tests/touch/now-owned-by-other.sh
 
 ALL_RECURSIVE_TARGETS += check-root
@@ -163,31 +163,31 @@ check-root:
 # Put head-elide-tail early, because it's long-running.
 
 all_tests =					\
-  tests/misc/help-version.sh			\
-  tests/misc/help-version-getopt.sh		\
-  tests/tail-2/inotify-race.sh			\
-  tests/tail-2/inotify-race2.sh			\
+  tests/help/help-version.sh			\
+  tests/help/help-version-getopt.sh		\
+  tests/tail/inotify-race.sh			\
+  tests/tail/inotify-race2.sh			\
   tests/misc/invalid-opt.pl			\
   tests/rm/ext3-perf.sh				\
   tests/rm/cycle.sh				\
   tests/cp/link-heap.sh				\
   tests/cp/no-ctx.sh				\
-  tests/misc/tty-eof.pl				\
+  tests/tty/tty-eof.pl				\
   tests/misc/read-errors.sh			\
-  tests/tail-2/inotify-hash-abuse.sh		\
-  tests/tail-2/inotify-hash-abuse2.sh		\
-  tests/tail-2/F-vs-missing.sh			\
-  tests/tail-2/F-vs-rename.sh			\
-  tests/tail-2/F-headers.sh			\
-  tests/tail-2/descriptor-vs-rename.sh		\
-  tests/tail-2/inotify-rotate.sh		\
-  tests/tail-2/inotify-rotate-resources.sh	\
-  tests/tail-2/inotify-dir-recreate.sh		\
-  tests/tail-2/inotify-only-regular.sh		\
+  tests/tail/inotify-hash-abuse.sh		\
+  tests/tail/inotify-hash-abuse2.sh		\
+  tests/tail/F-vs-missing.sh			\
+  tests/tail/F-vs-rename.sh			\
+  tests/tail/F-headers.sh			\
+  tests/tail/descriptor-vs-rename.sh		\
+  tests/tail/inotify-rotate.sh			\
+  tests/tail/inotify-rotate-resources.sh	\
+  tests/tail/inotify-dir-recreate.sh		\
+  tests/tail/inotify-only-regular.sh		\
   tests/chmod/no-x.sh				\
   tests/chgrp/basic.sh				\
   tests/rm/dangling-symlink.sh			\
-  tests/misc/ls-time.sh				\
+  tests/ls/ls-time.sh				\
   tests/rm/d-1.sh				\
   tests/rm/d-2.sh				\
   tests/rm/d-3.sh				\
@@ -202,7 +202,7 @@ all_tests =					\
   tests/rm/f-1.sh				\
   tests/rm/fail-eacces.sh			\
   tests/rm/fail-eperm.xpl			\
-  tests/tail-2/assert.sh			\
+  tests/tail/assert.sh				\
   tests/rm/hash.sh				\
   tests/rm/i-1.sh				\
   tests/rm/i-never.sh				\
@@ -242,159 +242,159 @@ all_tests =					\
   tests/fmt/long-line.sh			\
   tests/fmt/non-space.sh			\
   tests/misc/echo.sh				\
-  tests/misc/env.sh				\
-  tests/misc/env-signal-handler.sh		\
-  tests/misc/ptx.pl				\
-  tests/misc/test.pl				\
-  tests/misc/seq.pl				\
-  tests/misc/seq-epipe.sh			\
-  tests/misc/seq-extra-number.sh		\
-  tests/misc/seq-io-errors.sh			\
-  tests/misc/seq-locale.sh			\
-  tests/misc/seq-long-double.sh			\
-  tests/misc/seq-precision.sh			\
-  tests/misc/head.pl				\
-  tests/misc/head-elide-tail.pl			\
-  tests/tail-2/tail-n0f.sh			\
-  tests/misc/ls-misc.pl				\
-  tests/misc/date.pl				\
-  tests/misc/date-next-dow.pl			\
-  tests/misc/ptx-overrun.sh			\
+  tests/env/env.sh				\
+  tests/env/env-signal-handler.sh		\
+  tests/ptx/ptx.pl				\
+  tests/test/test.pl				\
+  tests/seq/seq.pl				\
+  tests/seq/seq-epipe.sh			\
+  tests/seq/seq-extra-number.sh			\
+  tests/seq/seq-io-errors.sh			\
+  tests/seq/seq-locale.sh			\
+  tests/seq/seq-long-double.sh			\
+  tests/seq/seq-precision.sh			\
+  tests/head/head.pl				\
+  tests/head/head-elide-tail.pl			\
+  tests/tail/tail-n0f.sh			\
+  tests/ls/ls-misc.pl				\
+  tests/date/date.pl				\
+  tests/date/date-next-dow.pl			\
+  tests/ptx/ptx-overrun.sh			\
   tests/misc/xstrtol.pl				\
-  tests/tail-2/overlay-headers.sh		\
-  tests/tail-2/pid.sh				\
-  tests/misc/od.pl				\
-  tests/misc/od-endian.sh			\
-  tests/misc/od-float.sh			\
+  tests/tail/overlay-headers.sh			\
+  tests/tail/pid.sh				\
+  tests/od/od.pl				\
+  tests/od/od-endian.sh				\
+  tests/od/od-float.sh				\
   tests/misc/mktemp.pl				\
   tests/misc/arch.sh				\
   tests/misc/join.pl				\
   tests/pr/pr-tests.pl				\
-  tests/misc/pwd-option.sh			\
-  tests/misc/chcon-fail.sh			\
+  tests/pwd/pwd-option.sh			\
+  tests/chcon/chcon-fail.sh			\
   tests/misc/coreutils.sh			\
-  tests/misc/cut.pl				\
-  tests/misc/cut-huge-range.sh			\
-  tests/misc/wc.pl				\
-  tests/misc/wc-files0-from.pl			\
-  tests/misc/wc-files0.sh			\
-  tests/misc/wc-nbsp.sh				\
-  tests/misc/wc-parallel.sh			\
-  tests/misc/wc-proc.sh				\
-  tests/misc/wc-total.sh			\
-  tests/misc/cat-E.sh				\
-  tests/misc/cat-proc.sh			\
-  tests/misc/cat-buf.sh				\
-  tests/misc/cat-self.sh			\
+  tests/cut/cut.pl				\
+  tests/cut/cut-huge-range.sh			\
+  tests/wc/wc.pl				\
+  tests/wc/wc-files0-from.pl			\
+  tests/wc/wc-files0.sh				\
+  tests/wc/wc-nbsp.sh				\
+  tests/wc/wc-parallel.sh			\
+  tests/wc/wc-proc.sh				\
+  tests/wc/wc-total.sh				\
+  tests/cat/cat-E.sh				\
+  tests/cat/cat-proc.sh				\
+  tests/cat/cat-buf.sh				\
+  tests/cat/cat-self.sh				\
   tests/misc/base64.pl				\
   tests/misc/basename.pl			\
   tests/misc/basenc.pl				\
   tests/misc/close-stdout.sh			\
-  tests/misc/chroot-fail.sh			\
-  tests/misc/cksum.sh				\
-  tests/misc/cksum-a.sh				\
-  tests/misc/cksum-c.sh				\
-  tests/misc/cksum-base64.pl			\
-  tests/misc/cksum-raw.sh			\
+  tests/chroot/chroot-fail.sh			\
+  tests/cksum/cksum.sh				\
+  tests/cksum/cksum-a.sh			\
+  tests/cksum/cksum-c.sh			\
+  tests/cksum/cksum-base64.pl			\
+  tests/cksum/cksum-raw.sh			\
   tests/misc/comm.pl				\
-  tests/misc/csplit.sh				\
-  tests/misc/csplit-1000.sh			\
-  tests/misc/csplit-heap.sh			\
-  tests/misc/csplit-io-err.sh			\
-  tests/misc/csplit-suppress-matched.pl		\
-  tests/misc/date-debug.sh			\
-  tests/misc/date-sec.sh			\
-  tests/misc/date-tz.sh				\
+  tests/csplit/csplit.sh			\
+  tests/csplit/csplit-1000.sh			\
+  tests/csplit/csplit-heap.sh			\
+  tests/csplit/csplit-io-err.sh			\
+  tests/csplit/csplit-suppress-matched.pl	\
+  tests/date/date-debug.sh			\
+  tests/date/date-sec.sh			\
+  tests/date/date-tz.sh				\
   tests/misc/dircolors.pl			\
   tests/misc/dirname.pl				\
-  tests/misc/env-null.sh			\
-  tests/misc/env-S.pl				\
-  tests/misc/env-S-script.sh			\
+  tests/env/env-null.sh				\
+  tests/env/env-S.pl				\
+  tests/env/env-S-script.sh			\
   tests/misc/expand.pl				\
-  tests/misc/expr.pl				\
-  tests/misc/expr-multibyte.pl			\
-  tests/misc/factor.pl				\
-  tests/misc/factor-parallel.sh			\
+  tests/expr/expr.pl				\
+  tests/expr/expr-multibyte.pl			\
+  tests/factor/factor.pl			\
+  tests/factor/factor-parallel.sh		\
   tests/misc/false-status.sh			\
   tests/misc/fold.pl				\
-  tests/misc/groups-dash.sh			\
-  tests/misc/groups-process-all.sh		\
-  tests/misc/groups-version.sh			\
-  tests/misc/head-c.sh				\
-  tests/misc/head-pos.sh			\
-  tests/misc/head-write-error.sh		\
+  tests/groups/groups-dash.sh			\
+  tests/groups/groups-process-all.sh		\
+  tests/groups/groups-version.sh		\
+  tests/head/head-c.sh				\
+  tests/head/head-pos.sh			\
+  tests/head/head-write-error.sh		\
   tests/misc/kill.sh				\
-  tests/misc/b2sum.sh				\
-  tests/misc/md5sum.pl				\
-  tests/misc/md5sum-bsd.sh			\
-  tests/misc/md5sum-newline.pl			\
-  tests/misc/md5sum-parallel.sh			\
+  tests/cksum/b2sum.sh				\
+  tests/cksum/md5sum.pl				\
+  tests/cksum/md5sum-bsd.sh			\
+  tests/cksum/md5sum-newline.pl			\
+  tests/cksum/md5sum-parallel.sh		\
   tests/misc/mknod.sh				\
-  tests/misc/nice.sh				\
-  tests/misc/nice-fail.sh			\
+  tests/nice/nice.sh				\
+  tests/nice/nice-fail.sh			\
   tests/misc/nl.sh				\
   tests/misc/nohup.sh				\
-  tests/misc/nproc-avail.sh			\
-  tests/misc/nproc-positive.sh			\
-  tests/misc/nproc-override.sh			\
+  tests/nproc/nproc-avail.sh			\
+  tests/nproc/nproc-positive.sh			\
+  tests/nproc/nproc-override.sh			\
   tests/misc/numfmt.pl				\
-  tests/misc/od-N.sh				\
-  tests/misc/od-j.sh				\
-  tests/misc/od-multiple-t.sh			\
-  tests/misc/od-x8.sh				\
+  tests/od/od-N.sh				\
+  tests/od/od-j.sh				\
+  tests/od/od-multiple-t.sh			\
+  tests/od/od-x8.sh				\
   tests/misc/paste.pl				\
-  tests/misc/pathchk1.sh			\
+  tests/misc/pathchk.sh				\
   tests/misc/printenv.sh			\
-  tests/misc/printf.sh				\
-  tests/misc/printf-cov.pl			\
-  tests/misc/printf-hex.sh			\
-  tests/misc/printf-mb.sh			\
-  tests/misc/printf-surprise.sh			\
-  tests/misc/printf-quote.sh			\
-  tests/misc/pwd-long.sh			\
-  tests/misc/readlink-fp-loop.sh		\
-  tests/misc/readlink-root.sh			\
+  tests/printf/printf.sh			\
+  tests/printf/printf-cov.pl			\
+  tests/printf/printf-hex.sh			\
+  tests/printf/printf-mb.sh			\
+  tests/printf/printf-surprise.sh		\
+  tests/printf/printf-quote.sh			\
+  tests/pwd/pwd-long.sh				\
+  tests/readlink/readlink-fp-loop.sh		\
+  tests/readlink/readlink-root.sh		\
   tests/misc/realpath.sh			\
-  tests/misc/runcon-compute.sh			\
-  tests/misc/runcon-no-reorder.sh		\
-  tests/misc/sha1sum.pl				\
-  tests/misc/sha1sum-vec.pl			\
-  tests/misc/sha224sum.pl			\
-  tests/misc/sha256sum.pl			\
-  tests/misc/sha384sum.pl			\
-  tests/misc/sha512sum.pl			\
-  tests/misc/shred-exact.sh			\
-  tests/misc/shred-passes.sh			\
-  tests/misc/shred-remove.sh			\
-  tests/misc/shred-size.sh			\
-  tests/misc/shuf.sh				\
-  tests/misc/shuf-reservoir.sh			\
+  tests/runcon/runcon-compute.sh		\
+  tests/runcon/runcon-no-reorder.sh		\
+  tests/cksum/sha1sum.pl			\
+  tests/cksum/sha1sum-vec.pl			\
+  tests/cksum/sha224sum.pl			\
+  tests/cksum/sha256sum.pl			\
+  tests/cksum/sha384sum.pl			\
+  tests/cksum/sha512sum.pl			\
+  tests/shred/shred-exact.sh			\
+  tests/shred/shred-passes.sh			\
+  tests/shred/shred-remove.sh			\
+  tests/shred/shred-size.sh			\
+  tests/shuf/shuf.sh				\
+  tests/shuf/shuf-reservoir.sh			\
   tests/misc/sleep.sh				\
-  tests/misc/sm3sum.pl				\
-  tests/misc/sort.pl				\
-  tests/misc/sort-benchmark-random.sh		\
-  tests/misc/sort-compress.sh			\
-  tests/misc/sort-compress-hang.sh		\
-  tests/misc/sort-compress-proc.sh		\
-  tests/misc/sort-continue.sh			\
-  tests/misc/sort-debug-keys.sh			\
-  tests/misc/sort-debug-warn.sh			\
-  tests/misc/sort-discrim.sh			\
-  tests/misc/sort-files0-from.pl		\
-  tests/misc/sort-float.sh			\
-  tests/misc/sort-h-thousands-sep.sh		\
-  tests/misc/sort-merge.pl			\
-  tests/misc/sort-merge-fdlimit.sh		\
-  tests/misc/sort-month.sh			\
-  tests/misc/sort-exit-early.sh			\
-  tests/misc/sort-rand.sh			\
-  tests/misc/sort-spinlock-abuse.sh		\
-  tests/misc/sort-stale-thread-mem.sh		\
-  tests/misc/sort-unique.sh			\
-  tests/misc/sort-unique-segv.sh		\
-  tests/misc/sort-version.sh			\
-  tests/misc/sort-NaN-infloop.sh		\
-  tests/misc/sort-u-FMR.sh			\
+  tests/cksum/sm3sum.pl				\
+  tests/sort/sort.pl				\
+  tests/sort/sort-benchmark-random.sh		\
+  tests/sort/sort-compress.sh			\
+  tests/sort/sort-compress-hang.sh		\
+  tests/sort/sort-compress-proc.sh		\
+  tests/sort/sort-continue.sh			\
+  tests/sort/sort-debug-keys.sh			\
+  tests/sort/sort-debug-warn.sh			\
+  tests/sort/sort-discrim.sh			\
+  tests/sort/sort-files0-from.pl		\
+  tests/sort/sort-float.sh			\
+  tests/sort/sort-h-thousands-sep.sh		\
+  tests/sort/sort-merge.pl			\
+  tests/sort/sort-merge-fdlimit.sh		\
+  tests/sort/sort-month.sh			\
+  tests/sort/sort-exit-early.sh			\
+  tests/sort/sort-rand.sh			\
+  tests/sort/sort-spinlock-abuse.sh		\
+  tests/sort/sort-stale-thread-mem.sh		\
+  tests/sort/sort-unique.sh			\
+  tests/sort/sort-unique-segv.sh		\
+  tests/sort/sort-version.sh			\
+  tests/sort/sort-NaN-infloop.sh		\
+  tests/sort/sort-u-FMR.sh			\
   tests/split/filter.sh				\
   tests/split/suffix-auto-length.sh		\
   tests/split/suffix-length.sh			\
@@ -408,58 +408,58 @@ all_tests =					\
   tests/split/record-sep.sh			\
   tests/split/numeric.sh			\
   tests/split/guard-input.sh			\
-  tests/misc/stat-birthtime.sh			\
-  tests/misc/stat-fmt.sh			\
-  tests/misc/stat-hyphen.sh			\
-  tests/misc/stat-mount.sh			\
-  tests/misc/stat-nanoseconds.sh		\
-  tests/misc/stat-printf.pl			\
-  tests/misc/stat-slash.sh			\
+  tests/stat/stat-birthtime.sh			\
+  tests/stat/stat-fmt.sh			\
+  tests/stat/stat-hyphen.sh			\
+  tests/stat/stat-mount.sh			\
+  tests/stat/stat-nanoseconds.sh		\
+  tests/stat/stat-printf.pl			\
+  tests/stat/stat-slash.sh			\
   tests/misc/stdbuf.sh				\
-  tests/misc/stty.sh				\
-  tests/misc/stty-invalid.sh			\
-  tests/misc/stty-pairs.sh			\
-  tests/misc/stty-row-col.sh			\
-  tests/misc/sum.pl				\
-  tests/misc/sum-sysv.sh			\
+  tests/stty/stty.sh				\
+  tests/stty/stty-invalid.sh			\
+  tests/stty/stty-pairs.sh			\
+  tests/stty/stty-row-col.sh			\
+  tests/cksum/sum.pl				\
+  tests/cksum/sum-sysv.sh			\
   tests/misc/sync.sh				\
-  tests/misc/tac.pl				\
-  tests/misc/tac-continue.sh			\
-  tests/misc/tac-2-nonseekable.sh		\
-  tests/misc/tail.pl				\
+  tests/tac/tac.pl				\
+  tests/tac/tac-continue.sh			\
+  tests/tac/tac-2-nonseekable.sh		\
+  tests/tail/tail.pl				\
   tests/misc/tee.sh				\
-  tests/misc/test-N.sh				\
-  tests/misc/test-diag.pl			\
+  tests/test/test-N.sh				\
+  tests/test/test-diag.pl			\
   tests/misc/time-style.sh			\
-  tests/misc/timeout.sh				\
-  tests/misc/timeout-blocked.pl			\
-  tests/misc/timeout-group.sh			\
-  tests/misc/timeout-large-parameters.sh	\
-  tests/misc/timeout-parameters.sh		\
-  tests/misc/tr.pl				\
-  tests/misc/tr-case-class.sh			\
-  tests/misc/truncate-dangling-symlink.sh	\
-  tests/misc/truncate-dir-fail.sh		\
-  tests/misc/truncate-fail-diag.sh		\
-  tests/misc/truncate-fifo.sh			\
-  tests/misc/truncate-no-create-missing.sh	\
-  tests/misc/truncate-overflow.sh		\
-  tests/misc/truncate-parameters.sh		\
-  tests/misc/truncate-relative.sh		\
+  tests/timeout/timeout.sh			\
+  tests/timeout/timeout-blocked.pl		\
+  tests/timeout/timeout-group.sh		\
+  tests/timeout/timeout-large-parameters.sh	\
+  tests/timeout/timeout-parameters.sh		\
+  tests/tr/tr.pl				\
+  tests/tr/tr-case-class.sh			\
+  tests/truncate/truncate-dangling-symlink.sh	\
+  tests/truncate/truncate-dir-fail.sh		\
+  tests/truncate/truncate-fail-diag.sh		\
+  tests/truncate/truncate-fifo.sh		\
+  tests/truncate/truncate-no-create-missing.sh	\
+  tests/truncate/truncate-overflow.sh		\
+  tests/truncate/truncate-parameters.sh		\
+  tests/truncate/truncate-relative.sh		\
   tests/misc/tsort.pl				\
-  tests/misc/tty.sh				\
+  tests/tty/tty.sh				\
   tests/misc/usage_vs_getopt.sh			\
   tests/misc/unexpand.pl			\
-  tests/misc/uniq.pl				\
-  tests/misc/uniq-perf.sh			\
-  tests/misc/uniq-collate.sh			\
+  tests/uniq/uniq.pl				\
+  tests/uniq/uniq-perf.sh			\
+  tests/uniq/uniq-collate.sh			\
   tests/misc/xattr.sh				\
   tests/misc/yes.sh				\
-  tests/tail-2/wait.sh				\
-  tests/tail-2/retry.sh				\
-  tests/tail-2/symlink.sh			\
-  tests/tail-2/tail-c.sh			\
-  tests/tail-2/truncate.sh			\
+  tests/tail/wait.sh				\
+  tests/tail/retry.sh				\
+  tests/tail/symlink.sh				\
+  tests/tail/tail-c.sh				\
+  tests/tail/truncate.sh			\
   tests/chmod/c-option.sh			\
   tests/chmod/equal-x.sh			\
   tests/chmod/equals.sh				\
@@ -714,15 +714,15 @@ all_tests =					\
   tests/rmdir/ignore.sh				\
   tests/rmdir/symlink-errors.sh			\
   tests/rmdir/t-slash.sh			\
-  tests/tail-2/assert-2.sh			\
-  tests/tail-2/big-4gb.sh			\
-  tests/tail-2/flush-initial.sh			\
-  tests/tail-2/follow-name.sh			\
-  tests/tail-2/follow-stdin.sh			\
-  tests/tail-2/pipe-f.sh			\
-  tests/tail-2/pipe-f2.sh			\
-  tests/tail-2/proc-ksyms.sh			\
-  tests/tail-2/start-middle.sh			\
+  tests/tail/assert-2.sh			\
+  tests/tail/big-4gb.sh				\
+  tests/tail/flush-initial.sh			\
+  tests/tail/follow-name.sh			\
+  tests/tail/follow-stdin.sh			\
+  tests/tail/pipe-f.sh				\
+  tests/tail/pipe-f2.sh				\
+  tests/tail/proc-ksyms.sh			\
+  tests/tail/start-middle.sh			\
   tests/touch/60-seconds.sh			\
   tests/touch/dangling-symlink.sh		\
   tests/touch/dir-1.sh				\
diff --git a/tests/misc/ls-misc.pl b/tests/ls/ls-misc.pl
index ae75c18e8..ae75c18e8 100755
--- a/tests/misc/ls-misc.pl
+++ b/tests/ls/ls-misc.pl
diff --git a/tests/misc/ls-time.sh b/tests/ls/ls-time.sh
index 5585d62d6..5585d62d6 100755
--- a/tests/misc/ls-time.sh
+++ b/tests/ls/ls-time.sh
diff --git a/tests/misc/pathchk1.sh b/tests/misc/pathchk.sh
index b0892ac4b..b0892ac4b 100755
--- a/tests/misc/pathchk1.sh
+++ b/tests/misc/pathchk.sh
diff --git a/tests/misc/nice-fail.sh b/tests/nice/nice-fail.sh
index 5ba7f5a23..5ba7f5a23 100755
--- a/tests/misc/nice-fail.sh
+++ b/tests/nice/nice-fail.sh
diff --git a/tests/misc/nice.sh b/tests/nice/nice.sh
index 2df94f351..2df94f351 100755
--- a/tests/misc/nice.sh
+++ b/tests/nice/nice.sh
diff --git a/tests/misc/nproc-avail.sh b/tests/nproc/nproc-avail.sh
index 271ba6ab6..271ba6ab6 100755
--- a/tests/misc/nproc-avail.sh
+++ b/tests/nproc/nproc-avail.sh
diff --git a/tests/misc/nproc-override.sh b/tests/nproc/nproc-override.sh
index e643bc37f..e643bc37f 100755
--- a/tests/misc/nproc-override.sh
+++ b/tests/nproc/nproc-override.sh
diff --git a/tests/misc/nproc-positive.sh b/tests/nproc/nproc-positive.sh
index d4936a1ff..d4936a1ff 100755
--- a/tests/misc/nproc-positive.sh
+++ b/tests/nproc/nproc-positive.sh
diff --git a/tests/misc/od-N.sh b/tests/od/od-N.sh
index 9e8c061bf..9e8c061bf 100755
--- a/tests/misc/od-N.sh
+++ b/tests/od/od-N.sh
diff --git a/tests/misc/od-endian.sh b/tests/od/od-endian.sh
index 6154894c5..6154894c5 100755
--- a/tests/misc/od-endian.sh
+++ b/tests/od/od-endian.sh
diff --git a/tests/misc/od-float.sh b/tests/od/od-float.sh
index a651cec48..a651cec48 100755
--- a/tests/misc/od-float.sh
+++ b/tests/od/od-float.sh
diff --git a/tests/misc/od-j.sh b/tests/od/od-j.sh
index 1c402cbca..1c402cbca 100755
--- a/tests/misc/od-j.sh
+++ b/tests/od/od-j.sh
diff --git a/tests/misc/od-multiple-t.sh b/tests/od/od-multiple-t.sh
index 729cdb247..729cdb247 100755
--- a/tests/misc/od-multiple-t.sh
+++ b/tests/od/od-multiple-t.sh
diff --git a/tests/misc/od-x8.sh b/tests/od/od-x8.sh
index 3b11bf7c1..3b11bf7c1 100755
--- a/tests/misc/od-x8.sh
+++ b/tests/od/od-x8.sh
diff --git a/tests/misc/od.pl b/tests/od/od.pl
index 7936ddb9f..7936ddb9f 100755
--- a/tests/misc/od.pl
+++ b/tests/od/od.pl
diff --git a/tests/misc/printf-cov.pl b/tests/printf/printf-cov.pl
index 988c2a711..988c2a711 100755
--- a/tests/misc/printf-cov.pl
+++ b/tests/printf/printf-cov.pl
diff --git a/tests/misc/printf-hex.sh b/tests/printf/printf-hex.sh
index 3aa9472e1..3aa9472e1 100755
--- a/tests/misc/printf-hex.sh
+++ b/tests/printf/printf-hex.sh
diff --git a/tests/misc/printf-mb.sh b/tests/printf/printf-mb.sh
index 418ad3564..418ad3564 100755
--- a/tests/misc/printf-mb.sh
+++ b/tests/printf/printf-mb.sh
diff --git a/tests/misc/printf-quote.sh b/tests/printf/printf-quote.sh
index d1671bd9d..d1671bd9d 100755
--- a/tests/misc/printf-quote.sh
+++ b/tests/printf/printf-quote.sh
diff --git a/tests/misc/printf-surprise.sh b/tests/printf/printf-surprise.sh
index fc3c064e5..fc3c064e5 100755
--- a/tests/misc/printf-surprise.sh
+++ b/tests/printf/printf-surprise.sh
diff --git a/tests/misc/printf.sh b/tests/printf/printf.sh
index 834012cc5..834012cc5 100755
--- a/tests/misc/printf.sh
+++ b/tests/printf/printf.sh
diff --git a/tests/misc/ptx-overrun.sh b/tests/ptx/ptx-overrun.sh
index 9b13ccc7d..9b13ccc7d 100755
--- a/tests/misc/ptx-overrun.sh
+++ b/tests/ptx/ptx-overrun.sh
diff --git a/tests/misc/ptx.pl b/tests/ptx/ptx.pl
index 46f88d851..46f88d851 100755
--- a/tests/misc/ptx.pl
+++ b/tests/ptx/ptx.pl
diff --git a/tests/misc/pwd-long.sh b/tests/pwd/pwd-long.sh
index 480cc197d..480cc197d 100755
--- a/tests/misc/pwd-long.sh
+++ b/tests/pwd/pwd-long.sh
diff --git a/tests/misc/pwd-option.sh b/tests/pwd/pwd-option.sh
index 50fc95775..50fc95775 100755
--- a/tests/misc/pwd-option.sh
+++ b/tests/pwd/pwd-option.sh
diff --git a/tests/misc/readlink-fp-loop.sh b/tests/readlink/readlink-fp-loop.sh
index f1e277a66..f1e277a66 100755
--- a/tests/misc/readlink-fp-loop.sh
+++ b/tests/readlink/readlink-fp-loop.sh
diff --git a/tests/misc/readlink-root.sh b/tests/readlink/readlink-root.sh
index 0015d3d93..0015d3d93 100755
--- a/tests/misc/readlink-root.sh
+++ b/tests/readlink/readlink-root.sh
diff --git a/tests/misc/runcon-compute.sh b/tests/runcon/runcon-compute.sh
index bc3cd8cab..bc3cd8cab 100755
--- a/tests/misc/runcon-compute.sh
+++ b/tests/runcon/runcon-compute.sh
diff --git a/tests/misc/runcon-no-reorder.sh b/tests/runcon/runcon-no-reorder.sh
index f07a4e59e..f07a4e59e 100755
--- a/tests/misc/runcon-no-reorder.sh
+++ b/tests/runcon/runcon-no-reorder.sh
diff --git a/tests/misc/seq-epipe.sh b/tests/seq/seq-epipe.sh
index 32e4a3a83..32e4a3a83 100755
--- a/tests/misc/seq-epipe.sh
+++ b/tests/seq/seq-epipe.sh
diff --git a/tests/misc/seq-extra-number.sh b/tests/seq/seq-extra-number.sh
index 0fe70a702..0fe70a702 100755
--- a/tests/misc/seq-extra-number.sh
+++ b/tests/seq/seq-extra-number.sh
diff --git a/tests/misc/seq-io-errors.sh b/tests/seq/seq-io-errors.sh
index 08bea76e6..08bea76e6 100755
--- a/tests/misc/seq-io-errors.sh
+++ b/tests/seq/seq-io-errors.sh
diff --git a/tests/misc/seq-locale.sh b/tests/seq/seq-locale.sh
index 6c4227167..6c4227167 100755
--- a/tests/misc/seq-locale.sh
+++ b/tests/seq/seq-locale.sh
diff --git a/tests/misc/seq-long-double.sh b/tests/seq/seq-long-double.sh
index 76b0a9314..76b0a9314 100755
--- a/tests/misc/seq-long-double.sh
+++ b/tests/seq/seq-long-double.sh
diff --git a/tests/misc/seq-precision.sh b/tests/seq/seq-precision.sh
index 25678aa30..25678aa30 100755
--- a/tests/misc/seq-precision.sh
+++ b/tests/seq/seq-precision.sh
diff --git a/tests/misc/seq.pl b/tests/seq/seq.pl
index 2990fa57e..2990fa57e 100755
--- a/tests/misc/seq.pl
+++ b/tests/seq/seq.pl
diff --git a/tests/misc/shred-exact.sh b/tests/shred/shred-exact.sh
index 17a8b0563..17a8b0563 100755
--- a/tests/misc/shred-exact.sh
+++ b/tests/shred/shred-exact.sh
diff --git a/tests/misc/shred-passes.sh b/tests/shred/shred-passes.sh
index 020cf688c..020cf688c 100755
--- a/tests/misc/shred-passes.sh
+++ b/tests/shred/shred-passes.sh
diff --git a/tests/misc/shred-remove.sh b/tests/shred/shred-remove.sh
index 25d58dbe8..25d58dbe8 100755
--- a/tests/misc/shred-remove.sh
+++ b/tests/shred/shred-remove.sh
diff --git a/tests/misc/shred-size.sh b/tests/shred/shred-size.sh
index 869058233..869058233 100755
--- a/tests/misc/shred-size.sh
+++ b/tests/shred/shred-size.sh
diff --git a/tests/misc/shuf-reservoir.sh b/tests/shuf/shuf-reservoir.sh
index 2edfe5010..2edfe5010 100755
--- a/tests/misc/shuf-reservoir.sh
+++ b/tests/shuf/shuf-reservoir.sh
diff --git a/tests/misc/shuf.sh b/tests/shuf/shuf.sh
index 57f9e38df..57f9e38df 100755
--- a/tests/misc/shuf.sh
+++ b/tests/shuf/shuf.sh
diff --git a/tests/misc/sort-NaN-infloop.sh b/tests/sort/sort-NaN-infloop.sh
index 9048865b4..9048865b4 100755
--- a/tests/misc/sort-NaN-infloop.sh
+++ b/tests/sort/sort-NaN-infloop.sh
diff --git a/tests/misc/sort-benchmark-random.sh b/tests/sort/sort-benchmark-random.sh
index cf26726a5..cf26726a5 100755
--- a/tests/misc/sort-benchmark-random.sh
+++ b/tests/sort/sort-benchmark-random.sh
diff --git a/tests/misc/sort-compress-hang.sh b/tests/sort/sort-compress-hang.sh
index 93c6febf8..93c6febf8 100755
--- a/tests/misc/sort-compress-hang.sh
+++ b/tests/sort/sort-compress-hang.sh
diff --git a/tests/misc/sort-compress-proc.sh b/tests/sort/sort-compress-proc.sh
index 07035be90..07035be90 100755
--- a/tests/misc/sort-compress-proc.sh
+++ b/tests/sort/sort-compress-proc.sh
diff --git a/tests/misc/sort-compress.sh b/tests/sort/sort-compress.sh
index fea4f0703..fea4f0703 100755
--- a/tests/misc/sort-compress.sh
+++ b/tests/sort/sort-compress.sh
diff --git a/tests/misc/sort-continue.sh b/tests/sort/sort-continue.sh
index c27336395..c27336395 100755
--- a/tests/misc/sort-continue.sh
+++ b/tests/sort/sort-continue.sh
diff --git a/tests/misc/sort-debug-keys.sh b/tests/sort/sort-debug-keys.sh
index c97c64a10..c97c64a10 100755
--- a/tests/misc/sort-debug-keys.sh
+++ b/tests/sort/sort-debug-keys.sh
diff --git a/tests/misc/sort-debug-warn.sh b/tests/sort/sort-debug-warn.sh
index ff0da95a7..ff0da95a7 100755
--- a/tests/misc/sort-debug-warn.sh
+++ b/tests/sort/sort-debug-warn.sh
diff --git a/tests/misc/sort-discrim.sh b/tests/sort/sort-discrim.sh
index 9912ea97e..9912ea97e 100755
--- a/tests/misc/sort-discrim.sh
+++ b/tests/sort/sort-discrim.sh
diff --git a/tests/misc/sort-exit-early.sh b/tests/sort/sort-exit-early.sh
index bd012a994..bd012a994 100755
--- a/tests/misc/sort-exit-early.sh
+++ b/tests/sort/sort-exit-early.sh
diff --git a/tests/misc/sort-files0-from.pl b/tests/sort/sort-files0-from.pl
index 56b28c01f..56b28c01f 100755
--- a/tests/misc/sort-files0-from.pl
+++ b/tests/sort/sort-files0-from.pl
diff --git a/tests/misc/sort-float.sh b/tests/sort/sort-float.sh
index 557096850..557096850 100755
--- a/tests/misc/sort-float.sh
+++ b/tests/sort/sort-float.sh
diff --git a/tests/misc/sort-h-thousands-sep.sh b/tests/sort/sort-h-thousands-sep.sh
index 5d1ff4f33..5d1ff4f33 100755
--- a/tests/misc/sort-h-thousands-sep.sh
+++ b/tests/sort/sort-h-thousands-sep.sh
diff --git a/tests/misc/sort-merge-fdlimit.sh b/tests/sort/sort-merge-fdlimit.sh
index db2d8ebf0..db2d8ebf0 100755
--- a/tests/misc/sort-merge-fdlimit.sh
+++ b/tests/sort/sort-merge-fdlimit.sh
diff --git a/tests/misc/sort-merge.pl b/tests/sort/sort-merge.pl
index bd439ef4a..bd439ef4a 100755
--- a/tests/misc/sort-merge.pl
+++ b/tests/sort/sort-merge.pl
diff --git a/tests/misc/sort-month.sh b/tests/sort/sort-month.sh
index 4fa74646a..4fa74646a 100755
--- a/tests/misc/sort-month.sh
+++ b/tests/sort/sort-month.sh
diff --git a/tests/misc/sort-rand.sh b/tests/sort/sort-rand.sh
index a80a76786..a80a76786 100755
--- a/tests/misc/sort-rand.sh
+++ b/tests/sort/sort-rand.sh
diff --git a/tests/misc/sort-spinlock-abuse.sh b/tests/sort/sort-spinlock-abuse.sh
index e59021334..e59021334 100755
--- a/tests/misc/sort-spinlock-abuse.sh
+++ b/tests/sort/sort-spinlock-abuse.sh
diff --git a/tests/misc/sort-stale-thread-mem.sh b/tests/sort/sort-stale-thread-mem.sh
index 482864e21..482864e21 100755
--- a/tests/misc/sort-stale-thread-mem.sh
+++ b/tests/sort/sort-stale-thread-mem.sh
diff --git a/tests/misc/sort-u-FMR.sh b/tests/sort/sort-u-FMR.sh
index 71a218672..71a218672 100755
--- a/tests/misc/sort-u-FMR.sh
+++ b/tests/sort/sort-u-FMR.sh
diff --git a/tests/misc/sort-unique-segv.sh b/tests/sort/sort-unique-segv.sh
index 8e332bb11..8e332bb11 100755
--- a/tests/misc/sort-unique-segv.sh
+++ b/tests/sort/sort-unique-segv.sh
diff --git a/tests/misc/sort-unique.sh b/tests/sort/sort-unique.sh
index df5b174aa..df5b174aa 100755
--- a/tests/misc/sort-unique.sh
+++ b/tests/sort/sort-unique.sh
diff --git a/tests/misc/sort-version.sh b/tests/sort/sort-version.sh
index 9a02729ed..9a02729ed 100755
--- a/tests/misc/sort-version.sh
+++ b/tests/sort/sort-version.sh
diff --git a/tests/misc/sort.pl b/tests/sort/sort.pl
index 46f1d7acd..46f1d7acd 100755
--- a/tests/misc/sort.pl
+++ b/tests/sort/sort.pl
diff --git a/tests/misc/stat-birthtime.sh b/tests/stat/stat-birthtime.sh
index 8d2e661a2..8d2e661a2 100755
--- a/tests/misc/stat-birthtime.sh
+++ b/tests/stat/stat-birthtime.sh
diff --git a/tests/misc/stat-fmt.sh b/tests/stat/stat-fmt.sh
index df5097371..df5097371 100755
--- a/tests/misc/stat-fmt.sh
+++ b/tests/stat/stat-fmt.sh
diff --git a/tests/misc/stat-hyphen.sh b/tests/stat/stat-hyphen.sh
index ea65c20e0..ea65c20e0 100755
--- a/tests/misc/stat-hyphen.sh
+++ b/tests/stat/stat-hyphen.sh
diff --git a/tests/misc/stat-mount.sh b/tests/stat/stat-mount.sh
index e07e89a79..e07e89a79 100755
--- a/tests/misc/stat-mount.sh
+++ b/tests/stat/stat-mount.sh
diff --git a/tests/misc/stat-nanoseconds.sh b/tests/stat/stat-nanoseconds.sh
index d42626e33..d42626e33 100755
--- a/tests/misc/stat-nanoseconds.sh
+++ b/tests/stat/stat-nanoseconds.sh
diff --git a/tests/misc/stat-printf.pl b/tests/stat/stat-printf.pl
index 491fb366f..491fb366f 100755
--- a/tests/misc/stat-printf.pl
+++ b/tests/stat/stat-printf.pl
diff --git a/tests/misc/stat-slash.sh b/tests/stat/stat-slash.sh
index 16ecce888..16ecce888 100755
--- a/tests/misc/stat-slash.sh
+++ b/tests/stat/stat-slash.sh
diff --git a/tests/misc/stty-invalid.sh b/tests/stty/stty-invalid.sh
index 7b65d0ca4..7b65d0ca4 100755
--- a/tests/misc/stty-invalid.sh
+++ b/tests/stty/stty-invalid.sh
diff --git a/tests/misc/stty-pairs.sh b/tests/stty/stty-pairs.sh
index fd32ba2f1..fd32ba2f1 100755
--- a/tests/misc/stty-pairs.sh
+++ b/tests/stty/stty-pairs.sh
diff --git a/tests/misc/stty-row-col.sh b/tests/stty/stty-row-col.sh
index 2b336e56e..2b336e56e 100755
--- a/tests/misc/stty-row-col.sh
+++ b/tests/stty/stty-row-col.sh
diff --git a/tests/misc/stty.sh b/tests/stty/stty.sh
index 6254ab88e..6254ab88e 100755
--- a/tests/misc/stty.sh
+++ b/tests/stty/stty.sh
diff --git a/tests/misc/tac-2-nonseekable.sh b/tests/tac/tac-2-nonseekable.sh
index 8e8075fa6..8e8075fa6 100755
--- a/tests/misc/tac-2-nonseekable.sh
+++ b/tests/tac/tac-2-nonseekable.sh
diff --git a/tests/misc/tac-continue.sh b/tests/tac/tac-continue.sh
index f01a772ae..f01a772ae 100755
--- a/tests/misc/tac-continue.sh
+++ b/tests/tac/tac-continue.sh
diff --git a/tests/misc/tac.pl b/tests/tac/tac.pl
index 1c188e41c..1c188e41c 100755
--- a/tests/misc/tac.pl
+++ b/tests/tac/tac.pl
diff --git a/tests/tail-2/F-headers.sh b/tests/tail/F-headers.sh
index ef4b9bc8a..ef4b9bc8a 100755
--- a/tests/tail-2/F-headers.sh
+++ b/tests/tail/F-headers.sh
diff --git a/tests/tail-2/F-vs-missing.sh b/tests/tail/F-vs-missing.sh
index da4d4f798..da4d4f798 100755
--- a/tests/tail-2/F-vs-missing.sh
+++ b/tests/tail/F-vs-missing.sh
diff --git a/tests/tail-2/F-vs-rename.sh b/tests/tail/F-vs-rename.sh
index 1048054fc..1048054fc 100755
--- a/tests/tail-2/F-vs-rename.sh
+++ b/tests/tail/F-vs-rename.sh
diff --git a/tests/tail-2/append-only.sh b/tests/tail/append-only.sh
index 9ce855bb7..9ce855bb7 100755
--- a/tests/tail-2/append-only.sh
+++ b/tests/tail/append-only.sh
diff --git a/tests/tail-2/assert-2.sh b/tests/tail/assert-2.sh
index 4592c8caf..4592c8caf 100755
--- a/tests/tail-2/assert-2.sh
+++ b/tests/tail/assert-2.sh
diff --git a/tests/tail-2/assert.sh b/tests/tail/assert.sh
index dda990463..dda990463 100755
--- a/tests/tail-2/assert.sh
+++ b/tests/tail/assert.sh
diff --git a/tests/tail-2/big-4gb.sh b/tests/tail/big-4gb.sh
index 2e8379bb4..2e8379bb4 100755
--- a/tests/tail-2/big-4gb.sh
+++ b/tests/tail/big-4gb.sh
diff --git a/tests/tail-2/descriptor-vs-rename.sh b/tests/tail/descriptor-vs-rename.sh
index f99a4affa..f99a4affa 100755
--- a/tests/tail-2/descriptor-vs-rename.sh
+++ b/tests/tail/descriptor-vs-rename.sh
diff --git a/tests/tail-2/end-of-device.sh b/tests/tail/end-of-device.sh
index 8c0da1dc1..8c0da1dc1 100755
--- a/tests/tail-2/end-of-device.sh
+++ b/tests/tail/end-of-device.sh
diff --git a/tests/tail-2/flush-initial.sh b/tests/tail/flush-initial.sh
index 00ca5356c..00ca5356c 100755
--- a/tests/tail-2/flush-initial.sh
+++ b/tests/tail/flush-initial.sh
diff --git a/tests/tail-2/follow-name.sh b/tests/tail/follow-name.sh
index a414b69c5..a414b69c5 100755
--- a/tests/tail-2/follow-name.sh
+++ b/tests/tail/follow-name.sh
diff --git a/tests/tail-2/follow-stdin.sh b/tests/tail/follow-stdin.sh
index 0c415d3d2..0c415d3d2 100755
--- a/tests/tail-2/follow-stdin.sh
+++ b/tests/tail/follow-stdin.sh
diff --git a/tests/tail-2/inotify-dir-recreate.sh b/tests/tail/inotify-dir-recreate.sh
index 3d2ce996a..3d2ce996a 100755
--- a/tests/tail-2/inotify-dir-recreate.sh
+++ b/tests/tail/inotify-dir-recreate.sh
diff --git a/tests/tail-2/inotify-hash-abuse.sh b/tests/tail/inotify-hash-abuse.sh
index 26af820bd..26af820bd 100755
--- a/tests/tail-2/inotify-hash-abuse.sh
+++ b/tests/tail/inotify-hash-abuse.sh
diff --git a/tests/tail-2/inotify-hash-abuse2.sh b/tests/tail/inotify-hash-abuse2.sh
index ba97d3b94..ba97d3b94 100755
--- a/tests/tail-2/inotify-hash-abuse2.sh
+++ b/tests/tail/inotify-hash-abuse2.sh
diff --git a/tests/tail-2/inotify-only-regular.sh b/tests/tail/inotify-only-regular.sh
index 2ecf66baa..2ecf66baa 100755
--- a/tests/tail-2/inotify-only-regular.sh
+++ b/tests/tail/inotify-only-regular.sh
diff --git a/tests/tail-2/inotify-race.sh b/tests/tail/inotify-race.sh
index 63f906536..63f906536 100755
--- a/tests/tail-2/inotify-race.sh
+++ b/tests/tail/inotify-race.sh
diff --git a/tests/tail-2/inotify-race2.sh b/tests/tail/inotify-race2.sh
index 19219b72e..19219b72e 100755
--- a/tests/tail-2/inotify-race2.sh
+++ b/tests/tail/inotify-race2.sh
diff --git a/tests/tail-2/inotify-rotate-resources.sh b/tests/tail/inotify-rotate-resources.sh
index 543529e85..543529e85 100755
--- a/tests/tail-2/inotify-rotate-resources.sh
+++ b/tests/tail/inotify-rotate-resources.sh
diff --git a/tests/tail-2/inotify-rotate.sh b/tests/tail/inotify-rotate.sh
index 55338b51c..55338b51c 100755
--- a/tests/tail-2/inotify-rotate.sh
+++ b/tests/tail/inotify-rotate.sh
diff --git a/tests/tail-2/overlay-headers.sh b/tests/tail/overlay-headers.sh
index 59f6e1e7b..59f6e1e7b 100755
--- a/tests/tail-2/overlay-headers.sh
+++ b/tests/tail/overlay-headers.sh
diff --git a/tests/tail-2/pid.sh b/tests/tail/pid.sh
index f931b2c70..f931b2c70 100755
--- a/tests/tail-2/pid.sh
+++ b/tests/tail/pid.sh
diff --git a/tests/tail-2/pipe-f.sh b/tests/tail/pipe-f.sh
index 46bcbbeae..46bcbbeae 100755
--- a/tests/tail-2/pipe-f.sh
+++ b/tests/tail/pipe-f.sh
diff --git a/tests/tail-2/pipe-f2.sh b/tests/tail/pipe-f2.sh
index edbe3ff00..edbe3ff00 100755
--- a/tests/tail-2/pipe-f2.sh
+++ b/tests/tail/pipe-f2.sh
diff --git a/tests/tail-2/proc-ksyms.sh b/tests/tail/proc-ksyms.sh
index 5f9b2391e..5f9b2391e 100755
--- a/tests/tail-2/proc-ksyms.sh
+++ b/tests/tail/proc-ksyms.sh
diff --git a/tests/tail-2/retry.sh b/tests/tail/retry.sh
index cb75e0580..cb75e0580 100755
--- a/tests/tail-2/retry.sh
+++ b/tests/tail/retry.sh
diff --git a/tests/tail-2/start-middle.sh b/tests/tail/start-middle.sh
index a64bb2d25..a64bb2d25 100755
--- a/tests/tail-2/start-middle.sh
+++ b/tests/tail/start-middle.sh
diff --git a/tests/tail-2/symlink.sh b/tests/tail/symlink.sh
index 97184d41a..97184d41a 100755
--- a/tests/tail-2/symlink.sh
+++ b/tests/tail/symlink.sh
diff --git a/tests/tail-2/tail-c.sh b/tests/tail/tail-c.sh
index cd9290910..cd9290910 100755
--- a/tests/tail-2/tail-c.sh
+++ b/tests/tail/tail-c.sh
diff --git a/tests/tail-2/tail-n0f.sh b/tests/tail/tail-n0f.sh
index a3ce5f83b..a3ce5f83b 100755
--- a/tests/tail-2/tail-n0f.sh
+++ b/tests/tail/tail-n0f.sh
diff --git a/tests/misc/tail.pl b/tests/tail/tail.pl
index 1ff1a907b..1ff1a907b 100755
--- a/tests/misc/tail.pl
+++ b/tests/tail/tail.pl
diff --git a/tests/tail-2/truncate.sh b/tests/tail/truncate.sh
index 7c9fbfc74..7c9fbfc74 100755
--- a/tests/tail-2/truncate.sh
+++ b/tests/tail/truncate.sh
diff --git a/tests/tail-2/wait.sh b/tests/tail/wait.sh
index 12b906bf4..12b906bf4 100755
--- a/tests/tail-2/wait.sh
+++ b/tests/tail/wait.sh
diff --git a/tests/misc/test-N.sh b/tests/test/test-N.sh
index 58b3976a9..58b3976a9 100755
--- a/tests/misc/test-N.sh
+++ b/tests/test/test-N.sh
diff --git a/tests/misc/test-diag.pl b/tests/test/test-diag.pl
index 521020386..521020386 100755
--- a/tests/misc/test-diag.pl
+++ b/tests/test/test-diag.pl
diff --git a/tests/misc/test.pl b/tests/test/test.pl
index dfc396881..dfc396881 100755
--- a/tests/misc/test.pl
+++ b/tests/test/test.pl
diff --git a/tests/misc/timeout-blocked.pl b/tests/timeout/timeout-blocked.pl
index 2ec865f5b..2ec865f5b 100755
--- a/tests/misc/timeout-blocked.pl
+++ b/tests/timeout/timeout-blocked.pl
diff --git a/tests/misc/timeout-group.sh b/tests/timeout/timeout-group.sh
index 053abc97b..053abc97b 100755
--- a/tests/misc/timeout-group.sh
+++ b/tests/timeout/timeout-group.sh
diff --git a/tests/misc/timeout-large-parameters.sh b/tests/timeout/timeout-large-parameters.sh
index 510d9850c..510d9850c 100755
--- a/tests/misc/timeout-large-parameters.sh
+++ b/tests/timeout/timeout-large-parameters.sh
diff --git a/tests/misc/timeout-parameters.sh b/tests/timeout/timeout-parameters.sh
index 8bb74c5b1..8bb74c5b1 100755
--- a/tests/misc/timeout-parameters.sh
+++ b/tests/timeout/timeout-parameters.sh
diff --git a/tests/misc/timeout.sh b/tests/timeout/timeout.sh
index 088177062..088177062 100755
--- a/tests/misc/timeout.sh
+++ b/tests/timeout/timeout.sh
diff --git a/tests/misc/tr-case-class.sh b/tests/tr/tr-case-class.sh
index 6f15b8afb..6f15b8afb 100755
--- a/tests/misc/tr-case-class.sh
+++ b/tests/tr/tr-case-class.sh
diff --git a/tests/misc/tr.pl b/tests/tr/tr.pl
index 997b8a6d3..997b8a6d3 100755
--- a/tests/misc/tr.pl
+++ b/tests/tr/tr.pl
diff --git a/tests/misc/truncate-dangling-symlink.sh b/tests/truncate/truncate-dangling-symlink.sh
index d2e3b79a4..d2e3b79a4 100755
--- a/tests/misc/truncate-dangling-symlink.sh
+++ b/tests/truncate/truncate-dangling-symlink.sh
diff --git a/tests/misc/truncate-dir-fail.sh b/tests/truncate/truncate-dir-fail.sh
index cee78010b..cee78010b 100755
--- a/tests/misc/truncate-dir-fail.sh
+++ b/tests/truncate/truncate-dir-fail.sh
diff --git a/tests/misc/truncate-fail-diag.sh b/tests/truncate/truncate-fail-diag.sh
index 225754832..225754832 100755
--- a/tests/misc/truncate-fail-diag.sh
+++ b/tests/truncate/truncate-fail-diag.sh
diff --git a/tests/misc/truncate-fifo.sh b/tests/truncate/truncate-fifo.sh
index c89555cb1..c89555cb1 100755
--- a/tests/misc/truncate-fifo.sh
+++ b/tests/truncate/truncate-fifo.sh
diff --git a/tests/misc/truncate-no-create-missing.sh b/tests/truncate/truncate-no-create-missing.sh
index bf6e6573b..bf6e6573b 100755
--- a/tests/misc/truncate-no-create-missing.sh
+++ b/tests/truncate/truncate-no-create-missing.sh
diff --git a/tests/misc/truncate-overflow.sh b/tests/truncate/truncate-overflow.sh
index 22bda70bb..22bda70bb 100755
--- a/tests/misc/truncate-overflow.sh
+++ b/tests/truncate/truncate-overflow.sh
diff --git a/tests/misc/truncate-owned-by-other.sh b/tests/truncate/truncate-owned-by-other.sh
index f213e8fe3..f213e8fe3 100755
--- a/tests/misc/truncate-owned-by-other.sh
+++ b/tests/truncate/truncate-owned-by-other.sh
diff --git a/tests/misc/truncate-parameters.sh b/tests/truncate/truncate-parameters.sh
index a7f5685d1..a7f5685d1 100755
--- a/tests/misc/truncate-parameters.sh
+++ b/tests/truncate/truncate-parameters.sh
diff --git a/tests/misc/truncate-relative.sh b/tests/truncate/truncate-relative.sh
index 57be8b457..57be8b457 100755
--- a/tests/misc/truncate-relative.sh
+++ b/tests/truncate/truncate-relative.sh
diff --git a/tests/misc/tty-eof.pl b/tests/tty/tty-eof.pl
index ad639189f..ad639189f 100755
--- a/tests/misc/tty-eof.pl
+++ b/tests/tty/tty-eof.pl
diff --git a/tests/misc/tty.sh b/tests/tty/tty.sh
index 0b0ff661d..0b0ff661d 100755
--- a/tests/misc/tty.sh
+++ b/tests/tty/tty.sh
diff --git a/tests/misc/uniq-collate.sh b/tests/uniq/uniq-collate.sh
index 76b1aaa5f..76b1aaa5f 100755
--- a/tests/misc/uniq-collate.sh
+++ b/tests/uniq/uniq-collate.sh
diff --git a/tests/misc/uniq-perf.sh b/tests/uniq/uniq-perf.sh
index b4af6734d..b4af6734d 100755
--- a/tests/misc/uniq-perf.sh
+++ b/tests/uniq/uniq-perf.sh
diff --git a/tests/misc/uniq.pl b/tests/uniq/uniq.pl
index a6354dc3c..a6354dc3c 100755
--- a/tests/misc/uniq.pl
+++ b/tests/uniq/uniq.pl
diff --git a/tests/misc/wc-files0-from.pl b/tests/wc/wc-files0-from.pl
index 84da7808c..84da7808c 100755
--- a/tests/misc/wc-files0-from.pl
+++ b/tests/wc/wc-files0-from.pl
diff --git a/tests/misc/wc-files0.sh b/tests/wc/wc-files0.sh
index 175230514..175230514 100755
--- a/tests/misc/wc-files0.sh
+++ b/tests/wc/wc-files0.sh
diff --git a/tests/misc/wc-nbsp.sh b/tests/wc/wc-nbsp.sh
index 584a8f735..584a8f735 100755
--- a/tests/misc/wc-nbsp.sh
+++ b/tests/wc/wc-nbsp.sh
diff --git a/tests/misc/wc-parallel.sh b/tests/wc/wc-parallel.sh
index 0319f6e89..0319f6e89 100755
--- a/tests/misc/wc-parallel.sh
+++ b/tests/wc/wc-parallel.sh
diff --git a/tests/misc/wc-proc.sh b/tests/wc/wc-proc.sh
index 2307f2c38..2307f2c38 100755
--- a/tests/misc/wc-proc.sh
+++ b/tests/wc/wc-proc.sh
diff --git a/tests/misc/wc-total.sh b/tests/wc/wc-total.sh
index 113b35504..113b35504 100755
--- a/tests/misc/wc-total.sh
+++ b/tests/wc/wc-total.sh
diff --git a/tests/misc/wc.pl b/tests/wc/wc.pl
index ed2bc43e4..ed2bc43e4 100755
--- a/tests/misc/wc.pl
+++ b/tests/wc/wc.pl