From 15925d0e5b80467c354fe27cb1205d6b6e3da11d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 11 Jun 2023 11:55:56 +0200
Subject: [PATCH] tests: move tests to a directory per utility

* cfg.mk: Adjust syntax check exclusion paths.
* tests/local.mk: Adjust for renamed tests.
---
 cfg.mk                                        |   4 +-
 tests/{misc => cat}/cat-E.sh                  |   0
 tests/{misc => cat}/cat-buf.sh                |   0
 tests/{misc => cat}/cat-proc.sh               |   0
 tests/{misc => cat}/cat-self.sh               |   0
 tests/{misc => chcon}/chcon-fail.sh           |   0
 tests/{misc => chcon}/chcon.sh                |   0
 tests/{misc => chroot}/chroot-credentials.sh  |   0
 tests/{misc => chroot}/chroot-fail.sh         |   0
 tests/{misc => cksum}/b2sum.sh                |   0
 tests/{misc => cksum}/cksum-a.sh              |   0
 tests/{misc => cksum}/cksum-base64.pl         |   0
 tests/{misc => cksum}/cksum-c.sh              |   0
 tests/{misc => cksum}/cksum-raw.sh            |   0
 tests/{misc => cksum}/cksum.sh                |   0
 tests/{misc => cksum}/md5sum-bsd.sh           |   0
 tests/{misc => cksum}/md5sum-newline.pl       |   0
 tests/{misc => cksum}/md5sum-parallel.sh      |   0
 tests/{misc => cksum}/md5sum.pl               |   0
 tests/{misc => cksum}/sha1sum-vec.pl          |   0
 tests/{misc => cksum}/sha1sum.pl              |   0
 tests/{misc => cksum}/sha224sum.pl            |   0
 tests/{misc => cksum}/sha256sum.pl            |   0
 tests/{misc => cksum}/sha384sum.pl            |   0
 tests/{misc => cksum}/sha512sum.pl            |   0
 tests/{misc => cksum}/sm3sum.pl               |   0
 tests/{misc => cksum}/sum-sysv.sh             |   0
 tests/{misc => cksum}/sum.pl                  |   0
 tests/{misc => csplit}/csplit-1000.sh         |   0
 tests/{misc => csplit}/csplit-heap.sh         |   0
 tests/{misc => csplit}/csplit-io-err.sh       |   0
 .../csplit-suppress-matched.pl                |   0
 tests/{misc => csplit}/csplit.sh              |   0
 tests/{misc => cut}/cut-huge-range.sh         |   0
 tests/{misc => cut}/cut.pl                    |   0
 tests/{misc => date}/date-debug.sh            |   0
 tests/{misc => date}/date-next-dow.pl         |   0
 tests/{misc => date}/date-sec.sh              |   0
 tests/{misc => date}/date-tz.sh               |   0
 tests/{misc => date}/date.pl                  |   0
 tests/{misc => env}/env-S-script.sh           |   0
 tests/{misc => env}/env-S.pl                  |   0
 tests/{misc => env}/env-null.sh               |   0
 tests/{misc => env}/env-signal-handler.sh     |   0
 tests/{misc => env}/env.sh                    |   0
 tests/{misc => expr}/expr-multibyte.pl        |   0
 tests/{misc => expr}/expr.pl                  |   0
 tests/{misc => factor}/factor-parallel.sh     |   0
 tests/{misc => factor}/factor.pl              |   0
 tests/{misc => groups}/groups-dash.sh         |   0
 tests/{misc => groups}/groups-process-all.sh  |   0
 tests/{misc => groups}/groups-version.sh      |   0
 tests/{misc => head}/head-c.sh                |   0
 tests/{misc => head}/head-elide-tail.pl       |   0
 tests/{misc => head}/head-pos.sh              |   0
 tests/{misc => head}/head-write-error.sh      |   0
 tests/{misc => head}/head.pl                  |   0
 tests/{misc => help}/help-version-getopt.sh   |   0
 tests/{misc => help}/help-version.sh          |   0
 tests/local.mk                                | 404 +++++++++---------
 tests/{misc => ls}/ls-misc.pl                 |   0
 tests/{misc => ls}/ls-time.sh                 |   0
 tests/misc/{pathchk1.sh => pathchk.sh}        |   0
 tests/{misc => nice}/nice-fail.sh             |   0
 tests/{misc => nice}/nice.sh                  |   0
 tests/{misc => nproc}/nproc-avail.sh          |   0
 tests/{misc => nproc}/nproc-override.sh       |   0
 tests/{misc => nproc}/nproc-positive.sh       |   0
 tests/{misc => od}/od-N.sh                    |   0
 tests/{misc => od}/od-endian.sh               |   0
 tests/{misc => od}/od-float.sh                |   0
 tests/{misc => od}/od-j.sh                    |   0
 tests/{misc => od}/od-multiple-t.sh           |   0
 tests/{misc => od}/od-x8.sh                   |   0
 tests/{misc => od}/od.pl                      |   0
 tests/{misc => printf}/printf-cov.pl          |   0
 tests/{misc => printf}/printf-hex.sh          |   0
 tests/{misc => printf}/printf-mb.sh           |   0
 tests/{misc => printf}/printf-quote.sh        |   0
 tests/{misc => printf}/printf-surprise.sh     |   0
 tests/{misc => printf}/printf.sh              |   0
 tests/{misc => ptx}/ptx-overrun.sh            |   0
 tests/{misc => ptx}/ptx.pl                    |   0
 tests/{misc => pwd}/pwd-long.sh               |   0
 tests/{misc => pwd}/pwd-option.sh             |   0
 tests/{misc => readlink}/readlink-fp-loop.sh  |   0
 tests/{misc => readlink}/readlink-root.sh     |   0
 tests/{misc => runcon}/runcon-compute.sh      |   0
 tests/{misc => runcon}/runcon-no-reorder.sh   |   0
 tests/{misc => seq}/seq-epipe.sh              |   0
 tests/{misc => seq}/seq-extra-number.sh       |   0
 tests/{misc => seq}/seq-io-errors.sh          |   0
 tests/{misc => seq}/seq-locale.sh             |   0
 tests/{misc => seq}/seq-long-double.sh        |   0
 tests/{misc => seq}/seq-precision.sh          |   0
 tests/{misc => seq}/seq.pl                    |   0
 tests/{misc => shred}/shred-exact.sh          |   0
 tests/{misc => shred}/shred-passes.sh         |   0
 tests/{misc => shred}/shred-remove.sh         |   0
 tests/{misc => shred}/shred-size.sh           |   0
 tests/{misc => shuf}/shuf-reservoir.sh        |   0
 tests/{misc => shuf}/shuf.sh                  |   0
 tests/{misc => sort}/sort-NaN-infloop.sh      |   0
 tests/{misc => sort}/sort-benchmark-random.sh |   0
 tests/{misc => sort}/sort-compress-hang.sh    |   0
 tests/{misc => sort}/sort-compress-proc.sh    |   0
 tests/{misc => sort}/sort-compress.sh         |   0
 tests/{misc => sort}/sort-continue.sh         |   0
 tests/{misc => sort}/sort-debug-keys.sh       |   0
 tests/{misc => sort}/sort-debug-warn.sh       |   0
 tests/{misc => sort}/sort-discrim.sh          |   0
 tests/{misc => sort}/sort-exit-early.sh       |   0
 tests/{misc => sort}/sort-files0-from.pl      |   0
 tests/{misc => sort}/sort-float.sh            |   0
 tests/{misc => sort}/sort-h-thousands-sep.sh  |   0
 tests/{misc => sort}/sort-merge-fdlimit.sh    |   0
 tests/{misc => sort}/sort-merge.pl            |   0
 tests/{misc => sort}/sort-month.sh            |   0
 tests/{misc => sort}/sort-rand.sh             |   0
 tests/{misc => sort}/sort-spinlock-abuse.sh   |   0
 tests/{misc => sort}/sort-stale-thread-mem.sh |   0
 tests/{misc => sort}/sort-u-FMR.sh            |   0
 tests/{misc => sort}/sort-unique-segv.sh      |   0
 tests/{misc => sort}/sort-unique.sh           |   0
 tests/{misc => sort}/sort-version.sh          |   0
 tests/{misc => sort}/sort.pl                  |   0
 tests/{misc => stat}/stat-birthtime.sh        |   0
 tests/{misc => stat}/stat-fmt.sh              |   0
 tests/{misc => stat}/stat-hyphen.sh           |   0
 tests/{misc => stat}/stat-mount.sh            |   0
 tests/{misc => stat}/stat-nanoseconds.sh      |   0
 tests/{misc => stat}/stat-printf.pl           |   0
 tests/{misc => stat}/stat-slash.sh            |   0
 tests/{misc => stty}/stty-invalid.sh          |   0
 tests/{misc => stty}/stty-pairs.sh            |   0
 tests/{misc => stty}/stty-row-col.sh          |   0
 tests/{misc => stty}/stty.sh                  |   0
 tests/{misc => tac}/tac-2-nonseekable.sh      |   0
 tests/{misc => tac}/tac-continue.sh           |   0
 tests/{misc => tac}/tac.pl                    |   0
 tests/{tail-2 => tail}/F-headers.sh           |   0
 tests/{tail-2 => tail}/F-vs-missing.sh        |   0
 tests/{tail-2 => tail}/F-vs-rename.sh         |   0
 tests/{tail-2 => tail}/append-only.sh         |   0
 tests/{tail-2 => tail}/assert-2.sh            |   0
 tests/{tail-2 => tail}/assert.sh              |   0
 tests/{tail-2 => tail}/big-4gb.sh             |   0
 .../{tail-2 => tail}/descriptor-vs-rename.sh  |   0
 tests/{tail-2 => tail}/end-of-device.sh       |   0
 tests/{tail-2 => tail}/flush-initial.sh       |   0
 tests/{tail-2 => tail}/follow-name.sh         |   0
 tests/{tail-2 => tail}/follow-stdin.sh        |   0
 .../{tail-2 => tail}/inotify-dir-recreate.sh  |   0
 tests/{tail-2 => tail}/inotify-hash-abuse.sh  |   0
 tests/{tail-2 => tail}/inotify-hash-abuse2.sh |   0
 .../{tail-2 => tail}/inotify-only-regular.sh  |   0
 tests/{tail-2 => tail}/inotify-race.sh        |   0
 tests/{tail-2 => tail}/inotify-race2.sh       |   0
 .../inotify-rotate-resources.sh               |   0
 tests/{tail-2 => tail}/inotify-rotate.sh      |   0
 tests/{tail-2 => tail}/overlay-headers.sh     |   0
 tests/{tail-2 => tail}/pid.sh                 |   0
 tests/{tail-2 => tail}/pipe-f.sh              |   0
 tests/{tail-2 => tail}/pipe-f2.sh             |   0
 tests/{tail-2 => tail}/proc-ksyms.sh          |   0
 tests/{tail-2 => tail}/retry.sh               |   0
 tests/{tail-2 => tail}/start-middle.sh        |   0
 tests/{tail-2 => tail}/symlink.sh             |   0
 tests/{tail-2 => tail}/tail-c.sh              |   0
 tests/{tail-2 => tail}/tail-n0f.sh            |   0
 tests/{misc => tail}/tail.pl                  |   0
 tests/{tail-2 => tail}/truncate.sh            |   0
 tests/{tail-2 => tail}/wait.sh                |   0
 tests/{misc => test}/test-N.sh                |   0
 tests/{misc => test}/test-diag.pl             |   0
 tests/{misc => test}/test.pl                  |   0
 tests/{misc => timeout}/timeout-blocked.pl    |   0
 tests/{misc => timeout}/timeout-group.sh      |   0
 .../timeout-large-parameters.sh               |   0
 tests/{misc => timeout}/timeout-parameters.sh |   0
 tests/{misc => timeout}/timeout.sh            |   0
 tests/{misc => tr}/tr-case-class.sh           |   0
 tests/{misc => tr}/tr.pl                      |   0
 .../truncate-dangling-symlink.sh              |   0
 tests/{misc => truncate}/truncate-dir-fail.sh |   0
 .../{misc => truncate}/truncate-fail-diag.sh  |   0
 tests/{misc => truncate}/truncate-fifo.sh     |   0
 .../truncate-no-create-missing.sh             |   0
 tests/{misc => truncate}/truncate-overflow.sh |   0
 .../truncate-owned-by-other.sh                |   0
 .../{misc => truncate}/truncate-parameters.sh |   0
 tests/{misc => truncate}/truncate-relative.sh |   0
 tests/{misc => tty}/tty-eof.pl                |   0
 tests/{misc => tty}/tty.sh                    |   0
 tests/{misc => uniq}/uniq-collate.sh          |   0
 tests/{misc => uniq}/uniq-perf.sh             |   0
 tests/{misc => uniq}/uniq.pl                  |   0
 tests/{misc => wc}/wc-files0-from.pl          |   0
 tests/{misc => wc}/wc-files0.sh               |   0
 tests/{misc => wc}/wc-nbsp.sh                 |   0
 tests/{misc => wc}/wc-parallel.sh             |   0
 tests/{misc => wc}/wc-proc.sh                 |   0
 tests/{misc => wc}/wc-total.sh                |   0
 tests/{misc => wc}/wc.pl                      |   0
 204 files changed, 204 insertions(+), 204 deletions(-)
 rename tests/{misc => cat}/cat-E.sh (100%)
 rename tests/{misc => cat}/cat-buf.sh (100%)
 rename tests/{misc => cat}/cat-proc.sh (100%)
 rename tests/{misc => cat}/cat-self.sh (100%)
 rename tests/{misc => chcon}/chcon-fail.sh (100%)
 rename tests/{misc => chcon}/chcon.sh (100%)
 rename tests/{misc => chroot}/chroot-credentials.sh (100%)
 rename tests/{misc => chroot}/chroot-fail.sh (100%)
 rename tests/{misc => cksum}/b2sum.sh (100%)
 rename tests/{misc => cksum}/cksum-a.sh (100%)
 rename tests/{misc => cksum}/cksum-base64.pl (100%)
 rename tests/{misc => cksum}/cksum-c.sh (100%)
 rename tests/{misc => cksum}/cksum-raw.sh (100%)
 rename tests/{misc => cksum}/cksum.sh (100%)
 rename tests/{misc => cksum}/md5sum-bsd.sh (100%)
 rename tests/{misc => cksum}/md5sum-newline.pl (100%)
 rename tests/{misc => cksum}/md5sum-parallel.sh (100%)
 rename tests/{misc => cksum}/md5sum.pl (100%)
 rename tests/{misc => cksum}/sha1sum-vec.pl (100%)
 rename tests/{misc => cksum}/sha1sum.pl (100%)
 rename tests/{misc => cksum}/sha224sum.pl (100%)
 rename tests/{misc => cksum}/sha256sum.pl (100%)
 rename tests/{misc => cksum}/sha384sum.pl (100%)
 rename tests/{misc => cksum}/sha512sum.pl (100%)
 rename tests/{misc => cksum}/sm3sum.pl (100%)
 rename tests/{misc => cksum}/sum-sysv.sh (100%)
 rename tests/{misc => cksum}/sum.pl (100%)
 rename tests/{misc => csplit}/csplit-1000.sh (100%)
 rename tests/{misc => csplit}/csplit-heap.sh (100%)
 rename tests/{misc => csplit}/csplit-io-err.sh (100%)
 rename tests/{misc => csplit}/csplit-suppress-matched.pl (100%)
 rename tests/{misc => csplit}/csplit.sh (100%)
 rename tests/{misc => cut}/cut-huge-range.sh (100%)
 rename tests/{misc => cut}/cut.pl (100%)
 rename tests/{misc => date}/date-debug.sh (100%)
 rename tests/{misc => date}/date-next-dow.pl (100%)
 rename tests/{misc => date}/date-sec.sh (100%)
 rename tests/{misc => date}/date-tz.sh (100%)
 rename tests/{misc => date}/date.pl (100%)
 rename tests/{misc => env}/env-S-script.sh (100%)
 rename tests/{misc => env}/env-S.pl (100%)
 rename tests/{misc => env}/env-null.sh (100%)
 rename tests/{misc => env}/env-signal-handler.sh (100%)
 rename tests/{misc => env}/env.sh (100%)
 rename tests/{misc => expr}/expr-multibyte.pl (100%)
 rename tests/{misc => expr}/expr.pl (100%)
 rename tests/{misc => factor}/factor-parallel.sh (100%)
 rename tests/{misc => factor}/factor.pl (100%)
 rename tests/{misc => groups}/groups-dash.sh (100%)
 rename tests/{misc => groups}/groups-process-all.sh (100%)
 rename tests/{misc => groups}/groups-version.sh (100%)
 rename tests/{misc => head}/head-c.sh (100%)
 rename tests/{misc => head}/head-elide-tail.pl (100%)
 rename tests/{misc => head}/head-pos.sh (100%)
 rename tests/{misc => head}/head-write-error.sh (100%)
 rename tests/{misc => head}/head.pl (100%)
 rename tests/{misc => help}/help-version-getopt.sh (100%)
 rename tests/{misc => help}/help-version.sh (100%)
 rename tests/{misc => ls}/ls-misc.pl (100%)
 rename tests/{misc => ls}/ls-time.sh (100%)
 rename tests/misc/{pathchk1.sh => pathchk.sh} (100%)
 rename tests/{misc => nice}/nice-fail.sh (100%)
 rename tests/{misc => nice}/nice.sh (100%)
 rename tests/{misc => nproc}/nproc-avail.sh (100%)
 rename tests/{misc => nproc}/nproc-override.sh (100%)
 rename tests/{misc => nproc}/nproc-positive.sh (100%)
 rename tests/{misc => od}/od-N.sh (100%)
 rename tests/{misc => od}/od-endian.sh (100%)
 rename tests/{misc => od}/od-float.sh (100%)
 rename tests/{misc => od}/od-j.sh (100%)
 rename tests/{misc => od}/od-multiple-t.sh (100%)
 rename tests/{misc => od}/od-x8.sh (100%)
 rename tests/{misc => od}/od.pl (100%)
 rename tests/{misc => printf}/printf-cov.pl (100%)
 rename tests/{misc => printf}/printf-hex.sh (100%)
 rename tests/{misc => printf}/printf-mb.sh (100%)
 rename tests/{misc => printf}/printf-quote.sh (100%)
 rename tests/{misc => printf}/printf-surprise.sh (100%)
 rename tests/{misc => printf}/printf.sh (100%)
 rename tests/{misc => ptx}/ptx-overrun.sh (100%)
 rename tests/{misc => ptx}/ptx.pl (100%)
 rename tests/{misc => pwd}/pwd-long.sh (100%)
 rename tests/{misc => pwd}/pwd-option.sh (100%)
 rename tests/{misc => readlink}/readlink-fp-loop.sh (100%)
 rename tests/{misc => readlink}/readlink-root.sh (100%)
 rename tests/{misc => runcon}/runcon-compute.sh (100%)
 rename tests/{misc => runcon}/runcon-no-reorder.sh (100%)
 rename tests/{misc => seq}/seq-epipe.sh (100%)
 rename tests/{misc => seq}/seq-extra-number.sh (100%)
 rename tests/{misc => seq}/seq-io-errors.sh (100%)
 rename tests/{misc => seq}/seq-locale.sh (100%)
 rename tests/{misc => seq}/seq-long-double.sh (100%)
 rename tests/{misc => seq}/seq-precision.sh (100%)
 rename tests/{misc => seq}/seq.pl (100%)
 rename tests/{misc => shred}/shred-exact.sh (100%)
 rename tests/{misc => shred}/shred-passes.sh (100%)
 rename tests/{misc => shred}/shred-remove.sh (100%)
 rename tests/{misc => shred}/shred-size.sh (100%)
 rename tests/{misc => shuf}/shuf-reservoir.sh (100%)
 rename tests/{misc => shuf}/shuf.sh (100%)
 rename tests/{misc => sort}/sort-NaN-infloop.sh (100%)
 rename tests/{misc => sort}/sort-benchmark-random.sh (100%)
 rename tests/{misc => sort}/sort-compress-hang.sh (100%)
 rename tests/{misc => sort}/sort-compress-proc.sh (100%)
 rename tests/{misc => sort}/sort-compress.sh (100%)
 rename tests/{misc => sort}/sort-continue.sh (100%)
 rename tests/{misc => sort}/sort-debug-keys.sh (100%)
 rename tests/{misc => sort}/sort-debug-warn.sh (100%)
 rename tests/{misc => sort}/sort-discrim.sh (100%)
 rename tests/{misc => sort}/sort-exit-early.sh (100%)
 rename tests/{misc => sort}/sort-files0-from.pl (100%)
 rename tests/{misc => sort}/sort-float.sh (100%)
 rename tests/{misc => sort}/sort-h-thousands-sep.sh (100%)
 rename tests/{misc => sort}/sort-merge-fdlimit.sh (100%)
 rename tests/{misc => sort}/sort-merge.pl (100%)
 rename tests/{misc => sort}/sort-month.sh (100%)
 rename tests/{misc => sort}/sort-rand.sh (100%)
 rename tests/{misc => sort}/sort-spinlock-abuse.sh (100%)
 rename tests/{misc => sort}/sort-stale-thread-mem.sh (100%)
 rename tests/{misc => sort}/sort-u-FMR.sh (100%)
 rename tests/{misc => sort}/sort-unique-segv.sh (100%)
 rename tests/{misc => sort}/sort-unique.sh (100%)
 rename tests/{misc => sort}/sort-version.sh (100%)
 rename tests/{misc => sort}/sort.pl (100%)
 rename tests/{misc => stat}/stat-birthtime.sh (100%)
 rename tests/{misc => stat}/stat-fmt.sh (100%)
 rename tests/{misc => stat}/stat-hyphen.sh (100%)
 rename tests/{misc => stat}/stat-mount.sh (100%)
 rename tests/{misc => stat}/stat-nanoseconds.sh (100%)
 rename tests/{misc => stat}/stat-printf.pl (100%)
 rename tests/{misc => stat}/stat-slash.sh (100%)
 rename tests/{misc => stty}/stty-invalid.sh (100%)
 rename tests/{misc => stty}/stty-pairs.sh (100%)
 rename tests/{misc => stty}/stty-row-col.sh (100%)
 rename tests/{misc => stty}/stty.sh (100%)
 rename tests/{misc => tac}/tac-2-nonseekable.sh (100%)
 rename tests/{misc => tac}/tac-continue.sh (100%)
 rename tests/{misc => tac}/tac.pl (100%)
 rename tests/{tail-2 => tail}/F-headers.sh (100%)
 rename tests/{tail-2 => tail}/F-vs-missing.sh (100%)
 rename tests/{tail-2 => tail}/F-vs-rename.sh (100%)
 rename tests/{tail-2 => tail}/append-only.sh (100%)
 rename tests/{tail-2 => tail}/assert-2.sh (100%)
 rename tests/{tail-2 => tail}/assert.sh (100%)
 rename tests/{tail-2 => tail}/big-4gb.sh (100%)
 rename tests/{tail-2 => tail}/descriptor-vs-rename.sh (100%)
 rename tests/{tail-2 => tail}/end-of-device.sh (100%)
 rename tests/{tail-2 => tail}/flush-initial.sh (100%)
 rename tests/{tail-2 => tail}/follow-name.sh (100%)
 rename tests/{tail-2 => tail}/follow-stdin.sh (100%)
 rename tests/{tail-2 => tail}/inotify-dir-recreate.sh (100%)
 rename tests/{tail-2 => tail}/inotify-hash-abuse.sh (100%)
 rename tests/{tail-2 => tail}/inotify-hash-abuse2.sh (100%)
 rename tests/{tail-2 => tail}/inotify-only-regular.sh (100%)
 rename tests/{tail-2 => tail}/inotify-race.sh (100%)
 rename tests/{tail-2 => tail}/inotify-race2.sh (100%)
 rename tests/{tail-2 => tail}/inotify-rotate-resources.sh (100%)
 rename tests/{tail-2 => tail}/inotify-rotate.sh (100%)
 rename tests/{tail-2 => tail}/overlay-headers.sh (100%)
 rename tests/{tail-2 => tail}/pid.sh (100%)
 rename tests/{tail-2 => tail}/pipe-f.sh (100%)
 rename tests/{tail-2 => tail}/pipe-f2.sh (100%)
 rename tests/{tail-2 => tail}/proc-ksyms.sh (100%)
 rename tests/{tail-2 => tail}/retry.sh (100%)
 rename tests/{tail-2 => tail}/start-middle.sh (100%)
 rename tests/{tail-2 => tail}/symlink.sh (100%)
 rename tests/{tail-2 => tail}/tail-c.sh (100%)
 rename tests/{tail-2 => tail}/tail-n0f.sh (100%)
 rename tests/{misc => tail}/tail.pl (100%)
 rename tests/{tail-2 => tail}/truncate.sh (100%)
 rename tests/{tail-2 => tail}/wait.sh (100%)
 rename tests/{misc => test}/test-N.sh (100%)
 rename tests/{misc => test}/test-diag.pl (100%)
 rename tests/{misc => test}/test.pl (100%)
 rename tests/{misc => timeout}/timeout-blocked.pl (100%)
 rename tests/{misc => timeout}/timeout-group.sh (100%)
 rename tests/{misc => timeout}/timeout-large-parameters.sh (100%)
 rename tests/{misc => timeout}/timeout-parameters.sh (100%)
 rename tests/{misc => timeout}/timeout.sh (100%)
 rename tests/{misc => tr}/tr-case-class.sh (100%)
 rename tests/{misc => tr}/tr.pl (100%)
 rename tests/{misc => truncate}/truncate-dangling-symlink.sh (100%)
 rename tests/{misc => truncate}/truncate-dir-fail.sh (100%)
 rename tests/{misc => truncate}/truncate-fail-diag.sh (100%)
 rename tests/{misc => truncate}/truncate-fifo.sh (100%)
 rename tests/{misc => truncate}/truncate-no-create-missing.sh (100%)
 rename tests/{misc => truncate}/truncate-overflow.sh (100%)
 rename tests/{misc => truncate}/truncate-owned-by-other.sh (100%)
 rename tests/{misc => truncate}/truncate-parameters.sh (100%)
 rename tests/{misc => truncate}/truncate-relative.sh (100%)
 rename tests/{misc => tty}/tty-eof.pl (100%)
 rename tests/{misc => tty}/tty.sh (100%)
 rename tests/{misc => uniq}/uniq-collate.sh (100%)
 rename tests/{misc => uniq}/uniq-perf.sh (100%)
 rename tests/{misc => uniq}/uniq.pl (100%)
 rename tests/{misc => wc}/wc-files0-from.pl (100%)
 rename tests/{misc => wc}/wc-files0.sh (100%)
 rename tests/{misc => wc}/wc-nbsp.sh (100%)
 rename tests/{misc => wc}/wc-parallel.sh (100%)
 rename tests/{misc => wc}/wc-proc.sh (100%)
 rename tests/{misc => wc}/wc-total.sh (100%)
 rename tests/{misc => wc}/wc.pl (100%)

diff --git a/cfg.mk b/cfg.mk
index a6d414cd75..92f119ee2f 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
similarity index 100%
rename from tests/misc/cat-E.sh
rename to tests/cat/cat-E.sh
diff --git a/tests/misc/cat-buf.sh b/tests/cat/cat-buf.sh
similarity index 100%
rename from tests/misc/cat-buf.sh
rename to tests/cat/cat-buf.sh
diff --git a/tests/misc/cat-proc.sh b/tests/cat/cat-proc.sh
similarity index 100%
rename from tests/misc/cat-proc.sh
rename to tests/cat/cat-proc.sh
diff --git a/tests/misc/cat-self.sh b/tests/cat/cat-self.sh
similarity index 100%
rename from tests/misc/cat-self.sh
rename to tests/cat/cat-self.sh
diff --git a/tests/misc/chcon-fail.sh b/tests/chcon/chcon-fail.sh
similarity index 100%
rename from tests/misc/chcon-fail.sh
rename to tests/chcon/chcon-fail.sh
diff --git a/tests/misc/chcon.sh b/tests/chcon/chcon.sh
similarity index 100%
rename from tests/misc/chcon.sh
rename to tests/chcon/chcon.sh
diff --git a/tests/misc/chroot-credentials.sh b/tests/chroot/chroot-credentials.sh
similarity index 100%
rename from tests/misc/chroot-credentials.sh
rename to tests/chroot/chroot-credentials.sh
diff --git a/tests/misc/chroot-fail.sh b/tests/chroot/chroot-fail.sh
similarity index 100%
rename from tests/misc/chroot-fail.sh
rename to tests/chroot/chroot-fail.sh
diff --git a/tests/misc/b2sum.sh b/tests/cksum/b2sum.sh
similarity index 100%
rename from tests/misc/b2sum.sh
rename to tests/cksum/b2sum.sh
diff --git a/tests/misc/cksum-a.sh b/tests/cksum/cksum-a.sh
similarity index 100%
rename from tests/misc/cksum-a.sh
rename to tests/cksum/cksum-a.sh
diff --git a/tests/misc/cksum-base64.pl b/tests/cksum/cksum-base64.pl
similarity index 100%
rename from tests/misc/cksum-base64.pl
rename to tests/cksum/cksum-base64.pl
diff --git a/tests/misc/cksum-c.sh b/tests/cksum/cksum-c.sh
similarity index 100%
rename from tests/misc/cksum-c.sh
rename to tests/cksum/cksum-c.sh
diff --git a/tests/misc/cksum-raw.sh b/tests/cksum/cksum-raw.sh
similarity index 100%
rename from tests/misc/cksum-raw.sh
rename to tests/cksum/cksum-raw.sh
diff --git a/tests/misc/cksum.sh b/tests/cksum/cksum.sh
similarity index 100%
rename from tests/misc/cksum.sh
rename to tests/cksum/cksum.sh
diff --git a/tests/misc/md5sum-bsd.sh b/tests/cksum/md5sum-bsd.sh
similarity index 100%
rename from tests/misc/md5sum-bsd.sh
rename to tests/cksum/md5sum-bsd.sh
diff --git a/tests/misc/md5sum-newline.pl b/tests/cksum/md5sum-newline.pl
similarity index 100%
rename from tests/misc/md5sum-newline.pl
rename to tests/cksum/md5sum-newline.pl
diff --git a/tests/misc/md5sum-parallel.sh b/tests/cksum/md5sum-parallel.sh
similarity index 100%
rename from tests/misc/md5sum-parallel.sh
rename to tests/cksum/md5sum-parallel.sh
diff --git a/tests/misc/md5sum.pl b/tests/cksum/md5sum.pl
similarity index 100%
rename from tests/misc/md5sum.pl
rename to tests/cksum/md5sum.pl
diff --git a/tests/misc/sha1sum-vec.pl b/tests/cksum/sha1sum-vec.pl
similarity index 100%
rename from tests/misc/sha1sum-vec.pl
rename to tests/cksum/sha1sum-vec.pl
diff --git a/tests/misc/sha1sum.pl b/tests/cksum/sha1sum.pl
similarity index 100%
rename from tests/misc/sha1sum.pl
rename to tests/cksum/sha1sum.pl
diff --git a/tests/misc/sha224sum.pl b/tests/cksum/sha224sum.pl
similarity index 100%
rename from tests/misc/sha224sum.pl
rename to tests/cksum/sha224sum.pl
diff --git a/tests/misc/sha256sum.pl b/tests/cksum/sha256sum.pl
similarity index 100%
rename from tests/misc/sha256sum.pl
rename to tests/cksum/sha256sum.pl
diff --git a/tests/misc/sha384sum.pl b/tests/cksum/sha384sum.pl
similarity index 100%
rename from tests/misc/sha384sum.pl
rename to tests/cksum/sha384sum.pl
diff --git a/tests/misc/sha512sum.pl b/tests/cksum/sha512sum.pl
similarity index 100%
rename from tests/misc/sha512sum.pl
rename to tests/cksum/sha512sum.pl
diff --git a/tests/misc/sm3sum.pl b/tests/cksum/sm3sum.pl
similarity index 100%
rename from tests/misc/sm3sum.pl
rename to tests/cksum/sm3sum.pl
diff --git a/tests/misc/sum-sysv.sh b/tests/cksum/sum-sysv.sh
similarity index 100%
rename from tests/misc/sum-sysv.sh
rename to tests/cksum/sum-sysv.sh
diff --git a/tests/misc/sum.pl b/tests/cksum/sum.pl
similarity index 100%
rename from tests/misc/sum.pl
rename to tests/cksum/sum.pl
diff --git a/tests/misc/csplit-1000.sh b/tests/csplit/csplit-1000.sh
similarity index 100%
rename from tests/misc/csplit-1000.sh
rename to tests/csplit/csplit-1000.sh
diff --git a/tests/misc/csplit-heap.sh b/tests/csplit/csplit-heap.sh
similarity index 100%
rename from tests/misc/csplit-heap.sh
rename to tests/csplit/csplit-heap.sh
diff --git a/tests/misc/csplit-io-err.sh b/tests/csplit/csplit-io-err.sh
similarity index 100%
rename from tests/misc/csplit-io-err.sh
rename to tests/csplit/csplit-io-err.sh
diff --git a/tests/misc/csplit-suppress-matched.pl b/tests/csplit/csplit-suppress-matched.pl
similarity index 100%
rename from tests/misc/csplit-suppress-matched.pl
rename to tests/csplit/csplit-suppress-matched.pl
diff --git a/tests/misc/csplit.sh b/tests/csplit/csplit.sh
similarity index 100%
rename from tests/misc/csplit.sh
rename to tests/csplit/csplit.sh
diff --git a/tests/misc/cut-huge-range.sh b/tests/cut/cut-huge-range.sh
similarity index 100%
rename from tests/misc/cut-huge-range.sh
rename to tests/cut/cut-huge-range.sh
diff --git a/tests/misc/cut.pl b/tests/cut/cut.pl
similarity index 100%
rename from tests/misc/cut.pl
rename to tests/cut/cut.pl
diff --git a/tests/misc/date-debug.sh b/tests/date/date-debug.sh
similarity index 100%
rename from tests/misc/date-debug.sh
rename to tests/date/date-debug.sh
diff --git a/tests/misc/date-next-dow.pl b/tests/date/date-next-dow.pl
similarity index 100%
rename from tests/misc/date-next-dow.pl
rename to tests/date/date-next-dow.pl
diff --git a/tests/misc/date-sec.sh b/tests/date/date-sec.sh
similarity index 100%
rename from tests/misc/date-sec.sh
rename to tests/date/date-sec.sh
diff --git a/tests/misc/date-tz.sh b/tests/date/date-tz.sh
similarity index 100%
rename from tests/misc/date-tz.sh
rename to tests/date/date-tz.sh
diff --git a/tests/misc/date.pl b/tests/date/date.pl
similarity index 100%
rename from tests/misc/date.pl
rename to tests/date/date.pl
diff --git a/tests/misc/env-S-script.sh b/tests/env/env-S-script.sh
similarity index 100%
rename from tests/misc/env-S-script.sh
rename to tests/env/env-S-script.sh
diff --git a/tests/misc/env-S.pl b/tests/env/env-S.pl
similarity index 100%
rename from tests/misc/env-S.pl
rename to tests/env/env-S.pl
diff --git a/tests/misc/env-null.sh b/tests/env/env-null.sh
similarity index 100%
rename from tests/misc/env-null.sh
rename to tests/env/env-null.sh
diff --git a/tests/misc/env-signal-handler.sh b/tests/env/env-signal-handler.sh
similarity index 100%
rename from tests/misc/env-signal-handler.sh
rename to tests/env/env-signal-handler.sh
diff --git a/tests/misc/env.sh b/tests/env/env.sh
similarity index 100%
rename from tests/misc/env.sh
rename to tests/env/env.sh
diff --git a/tests/misc/expr-multibyte.pl b/tests/expr/expr-multibyte.pl
similarity index 100%
rename from tests/misc/expr-multibyte.pl
rename to tests/expr/expr-multibyte.pl
diff --git a/tests/misc/expr.pl b/tests/expr/expr.pl
similarity index 100%
rename from tests/misc/expr.pl
rename to tests/expr/expr.pl
diff --git a/tests/misc/factor-parallel.sh b/tests/factor/factor-parallel.sh
similarity index 100%
rename from tests/misc/factor-parallel.sh
rename to tests/factor/factor-parallel.sh
diff --git a/tests/misc/factor.pl b/tests/factor/factor.pl
similarity index 100%
rename from tests/misc/factor.pl
rename to tests/factor/factor.pl
diff --git a/tests/misc/groups-dash.sh b/tests/groups/groups-dash.sh
similarity index 100%
rename from tests/misc/groups-dash.sh
rename to tests/groups/groups-dash.sh
diff --git a/tests/misc/groups-process-all.sh b/tests/groups/groups-process-all.sh
similarity index 100%
rename from tests/misc/groups-process-all.sh
rename to tests/groups/groups-process-all.sh
diff --git a/tests/misc/groups-version.sh b/tests/groups/groups-version.sh
similarity index 100%
rename from tests/misc/groups-version.sh
rename to tests/groups/groups-version.sh
diff --git a/tests/misc/head-c.sh b/tests/head/head-c.sh
similarity index 100%
rename from tests/misc/head-c.sh
rename to tests/head/head-c.sh
diff --git a/tests/misc/head-elide-tail.pl b/tests/head/head-elide-tail.pl
similarity index 100%
rename from tests/misc/head-elide-tail.pl
rename to tests/head/head-elide-tail.pl
diff --git a/tests/misc/head-pos.sh b/tests/head/head-pos.sh
similarity index 100%
rename from tests/misc/head-pos.sh
rename to tests/head/head-pos.sh
diff --git a/tests/misc/head-write-error.sh b/tests/head/head-write-error.sh
similarity index 100%
rename from tests/misc/head-write-error.sh
rename to tests/head/head-write-error.sh
diff --git a/tests/misc/head.pl b/tests/head/head.pl
similarity index 100%
rename from tests/misc/head.pl
rename to tests/head/head.pl
diff --git a/tests/misc/help-version-getopt.sh b/tests/help/help-version-getopt.sh
similarity index 100%
rename from tests/misc/help-version-getopt.sh
rename to tests/help/help-version-getopt.sh
diff --git a/tests/misc/help-version.sh b/tests/help/help-version.sh
similarity index 100%
rename from tests/misc/help-version.sh
rename to tests/help/help-version.sh
diff --git a/tests/local.mk b/tests/local.mk
index 23a518a227..cc65fe6560 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
similarity index 100%
rename from tests/misc/ls-misc.pl
rename to tests/ls/ls-misc.pl
diff --git a/tests/misc/ls-time.sh b/tests/ls/ls-time.sh
similarity index 100%
rename from tests/misc/ls-time.sh
rename to tests/ls/ls-time.sh
diff --git a/tests/misc/pathchk1.sh b/tests/misc/pathchk.sh
similarity index 100%
rename from tests/misc/pathchk1.sh
rename to tests/misc/pathchk.sh
diff --git a/tests/misc/nice-fail.sh b/tests/nice/nice-fail.sh
similarity index 100%
rename from tests/misc/nice-fail.sh
rename to tests/nice/nice-fail.sh
diff --git a/tests/misc/nice.sh b/tests/nice/nice.sh
similarity index 100%
rename from tests/misc/nice.sh
rename to tests/nice/nice.sh
diff --git a/tests/misc/nproc-avail.sh b/tests/nproc/nproc-avail.sh
similarity index 100%
rename from tests/misc/nproc-avail.sh
rename to tests/nproc/nproc-avail.sh
diff --git a/tests/misc/nproc-override.sh b/tests/nproc/nproc-override.sh
similarity index 100%
rename from tests/misc/nproc-override.sh
rename to tests/nproc/nproc-override.sh
diff --git a/tests/misc/nproc-positive.sh b/tests/nproc/nproc-positive.sh
similarity index 100%
rename from tests/misc/nproc-positive.sh
rename to tests/nproc/nproc-positive.sh
diff --git a/tests/misc/od-N.sh b/tests/od/od-N.sh
similarity index 100%
rename from tests/misc/od-N.sh
rename to tests/od/od-N.sh
diff --git a/tests/misc/od-endian.sh b/tests/od/od-endian.sh
similarity index 100%
rename from tests/misc/od-endian.sh
rename to tests/od/od-endian.sh
diff --git a/tests/misc/od-float.sh b/tests/od/od-float.sh
similarity index 100%
rename from tests/misc/od-float.sh
rename to tests/od/od-float.sh
diff --git a/tests/misc/od-j.sh b/tests/od/od-j.sh
similarity index 100%
rename from tests/misc/od-j.sh
rename to tests/od/od-j.sh
diff --git a/tests/misc/od-multiple-t.sh b/tests/od/od-multiple-t.sh
similarity index 100%
rename from tests/misc/od-multiple-t.sh
rename to tests/od/od-multiple-t.sh
diff --git a/tests/misc/od-x8.sh b/tests/od/od-x8.sh
similarity index 100%
rename from tests/misc/od-x8.sh
rename to tests/od/od-x8.sh
diff --git a/tests/misc/od.pl b/tests/od/od.pl
similarity index 100%
rename from tests/misc/od.pl
rename to tests/od/od.pl
diff --git a/tests/misc/printf-cov.pl b/tests/printf/printf-cov.pl
similarity index 100%
rename from tests/misc/printf-cov.pl
rename to tests/printf/printf-cov.pl
diff --git a/tests/misc/printf-hex.sh b/tests/printf/printf-hex.sh
similarity index 100%
rename from tests/misc/printf-hex.sh
rename to tests/printf/printf-hex.sh
diff --git a/tests/misc/printf-mb.sh b/tests/printf/printf-mb.sh
similarity index 100%
rename from tests/misc/printf-mb.sh
rename to tests/printf/printf-mb.sh
diff --git a/tests/misc/printf-quote.sh b/tests/printf/printf-quote.sh
similarity index 100%
rename from tests/misc/printf-quote.sh
rename to tests/printf/printf-quote.sh
diff --git a/tests/misc/printf-surprise.sh b/tests/printf/printf-surprise.sh
similarity index 100%
rename from tests/misc/printf-surprise.sh
rename to tests/printf/printf-surprise.sh
diff --git a/tests/misc/printf.sh b/tests/printf/printf.sh
similarity index 100%
rename from tests/misc/printf.sh
rename to tests/printf/printf.sh
diff --git a/tests/misc/ptx-overrun.sh b/tests/ptx/ptx-overrun.sh
similarity index 100%
rename from tests/misc/ptx-overrun.sh
rename to tests/ptx/ptx-overrun.sh
diff --git a/tests/misc/ptx.pl b/tests/ptx/ptx.pl
similarity index 100%
rename from tests/misc/ptx.pl
rename to tests/ptx/ptx.pl
diff --git a/tests/misc/pwd-long.sh b/tests/pwd/pwd-long.sh
similarity index 100%
rename from tests/misc/pwd-long.sh
rename to tests/pwd/pwd-long.sh
diff --git a/tests/misc/pwd-option.sh b/tests/pwd/pwd-option.sh
similarity index 100%
rename from tests/misc/pwd-option.sh
rename to tests/pwd/pwd-option.sh
diff --git a/tests/misc/readlink-fp-loop.sh b/tests/readlink/readlink-fp-loop.sh
similarity index 100%
rename from tests/misc/readlink-fp-loop.sh
rename to tests/readlink/readlink-fp-loop.sh
diff --git a/tests/misc/readlink-root.sh b/tests/readlink/readlink-root.sh
similarity index 100%
rename from tests/misc/readlink-root.sh
rename to tests/readlink/readlink-root.sh
diff --git a/tests/misc/runcon-compute.sh b/tests/runcon/runcon-compute.sh
similarity index 100%
rename from tests/misc/runcon-compute.sh
rename to tests/runcon/runcon-compute.sh
diff --git a/tests/misc/runcon-no-reorder.sh b/tests/runcon/runcon-no-reorder.sh
similarity index 100%
rename from tests/misc/runcon-no-reorder.sh
rename to tests/runcon/runcon-no-reorder.sh
diff --git a/tests/misc/seq-epipe.sh b/tests/seq/seq-epipe.sh
similarity index 100%
rename from tests/misc/seq-epipe.sh
rename to tests/seq/seq-epipe.sh
diff --git a/tests/misc/seq-extra-number.sh b/tests/seq/seq-extra-number.sh
similarity index 100%
rename from tests/misc/seq-extra-number.sh
rename to tests/seq/seq-extra-number.sh
diff --git a/tests/misc/seq-io-errors.sh b/tests/seq/seq-io-errors.sh
similarity index 100%
rename from tests/misc/seq-io-errors.sh
rename to tests/seq/seq-io-errors.sh
diff --git a/tests/misc/seq-locale.sh b/tests/seq/seq-locale.sh
similarity index 100%
rename from tests/misc/seq-locale.sh
rename to tests/seq/seq-locale.sh
diff --git a/tests/misc/seq-long-double.sh b/tests/seq/seq-long-double.sh
similarity index 100%
rename from tests/misc/seq-long-double.sh
rename to tests/seq/seq-long-double.sh
diff --git a/tests/misc/seq-precision.sh b/tests/seq/seq-precision.sh
similarity index 100%
rename from tests/misc/seq-precision.sh
rename to tests/seq/seq-precision.sh
diff --git a/tests/misc/seq.pl b/tests/seq/seq.pl
similarity index 100%
rename from tests/misc/seq.pl
rename to tests/seq/seq.pl
diff --git a/tests/misc/shred-exact.sh b/tests/shred/shred-exact.sh
similarity index 100%
rename from tests/misc/shred-exact.sh
rename to tests/shred/shred-exact.sh
diff --git a/tests/misc/shred-passes.sh b/tests/shred/shred-passes.sh
similarity index 100%
rename from tests/misc/shred-passes.sh
rename to tests/shred/shred-passes.sh
diff --git a/tests/misc/shred-remove.sh b/tests/shred/shred-remove.sh
similarity index 100%
rename from tests/misc/shred-remove.sh
rename to tests/shred/shred-remove.sh
diff --git a/tests/misc/shred-size.sh b/tests/shred/shred-size.sh
similarity index 100%
rename from tests/misc/shred-size.sh
rename to tests/shred/shred-size.sh
diff --git a/tests/misc/shuf-reservoir.sh b/tests/shuf/shuf-reservoir.sh
similarity index 100%
rename from tests/misc/shuf-reservoir.sh
rename to tests/shuf/shuf-reservoir.sh
diff --git a/tests/misc/shuf.sh b/tests/shuf/shuf.sh
similarity index 100%
rename from tests/misc/shuf.sh
rename to tests/shuf/shuf.sh
diff --git a/tests/misc/sort-NaN-infloop.sh b/tests/sort/sort-NaN-infloop.sh
similarity index 100%
rename from tests/misc/sort-NaN-infloop.sh
rename to tests/sort/sort-NaN-infloop.sh
diff --git a/tests/misc/sort-benchmark-random.sh b/tests/sort/sort-benchmark-random.sh
similarity index 100%
rename from tests/misc/sort-benchmark-random.sh
rename to tests/sort/sort-benchmark-random.sh
diff --git a/tests/misc/sort-compress-hang.sh b/tests/sort/sort-compress-hang.sh
similarity index 100%
rename from tests/misc/sort-compress-hang.sh
rename to tests/sort/sort-compress-hang.sh
diff --git a/tests/misc/sort-compress-proc.sh b/tests/sort/sort-compress-proc.sh
similarity index 100%
rename from tests/misc/sort-compress-proc.sh
rename to tests/sort/sort-compress-proc.sh
diff --git a/tests/misc/sort-compress.sh b/tests/sort/sort-compress.sh
similarity index 100%
rename from tests/misc/sort-compress.sh
rename to tests/sort/sort-compress.sh
diff --git a/tests/misc/sort-continue.sh b/tests/sort/sort-continue.sh
similarity index 100%
rename from tests/misc/sort-continue.sh
rename to tests/sort/sort-continue.sh
diff --git a/tests/misc/sort-debug-keys.sh b/tests/sort/sort-debug-keys.sh
similarity index 100%
rename from tests/misc/sort-debug-keys.sh
rename to tests/sort/sort-debug-keys.sh
diff --git a/tests/misc/sort-debug-warn.sh b/tests/sort/sort-debug-warn.sh
similarity index 100%
rename from tests/misc/sort-debug-warn.sh
rename to tests/sort/sort-debug-warn.sh
diff --git a/tests/misc/sort-discrim.sh b/tests/sort/sort-discrim.sh
similarity index 100%
rename from tests/misc/sort-discrim.sh
rename to tests/sort/sort-discrim.sh
diff --git a/tests/misc/sort-exit-early.sh b/tests/sort/sort-exit-early.sh
similarity index 100%
rename from tests/misc/sort-exit-early.sh
rename to tests/sort/sort-exit-early.sh
diff --git a/tests/misc/sort-files0-from.pl b/tests/sort/sort-files0-from.pl
similarity index 100%
rename from tests/misc/sort-files0-from.pl
rename to tests/sort/sort-files0-from.pl
diff --git a/tests/misc/sort-float.sh b/tests/sort/sort-float.sh
similarity index 100%
rename from tests/misc/sort-float.sh
rename to tests/sort/sort-float.sh
diff --git a/tests/misc/sort-h-thousands-sep.sh b/tests/sort/sort-h-thousands-sep.sh
similarity index 100%
rename from tests/misc/sort-h-thousands-sep.sh
rename to tests/sort/sort-h-thousands-sep.sh
diff --git a/tests/misc/sort-merge-fdlimit.sh b/tests/sort/sort-merge-fdlimit.sh
similarity index 100%
rename from tests/misc/sort-merge-fdlimit.sh
rename to tests/sort/sort-merge-fdlimit.sh
diff --git a/tests/misc/sort-merge.pl b/tests/sort/sort-merge.pl
similarity index 100%
rename from tests/misc/sort-merge.pl
rename to tests/sort/sort-merge.pl
diff --git a/tests/misc/sort-month.sh b/tests/sort/sort-month.sh
similarity index 100%
rename from tests/misc/sort-month.sh
rename to tests/sort/sort-month.sh
diff --git a/tests/misc/sort-rand.sh b/tests/sort/sort-rand.sh
similarity index 100%
rename from tests/misc/sort-rand.sh
rename to tests/sort/sort-rand.sh
diff --git a/tests/misc/sort-spinlock-abuse.sh b/tests/sort/sort-spinlock-abuse.sh
similarity index 100%
rename from tests/misc/sort-spinlock-abuse.sh
rename to tests/sort/sort-spinlock-abuse.sh
diff --git a/tests/misc/sort-stale-thread-mem.sh b/tests/sort/sort-stale-thread-mem.sh
similarity index 100%
rename from tests/misc/sort-stale-thread-mem.sh
rename to tests/sort/sort-stale-thread-mem.sh
diff --git a/tests/misc/sort-u-FMR.sh b/tests/sort/sort-u-FMR.sh
similarity index 100%
rename from tests/misc/sort-u-FMR.sh
rename to tests/sort/sort-u-FMR.sh
diff --git a/tests/misc/sort-unique-segv.sh b/tests/sort/sort-unique-segv.sh
similarity index 100%
rename from tests/misc/sort-unique-segv.sh
rename to tests/sort/sort-unique-segv.sh
diff --git a/tests/misc/sort-unique.sh b/tests/sort/sort-unique.sh
similarity index 100%
rename from tests/misc/sort-unique.sh
rename to tests/sort/sort-unique.sh
diff --git a/tests/misc/sort-version.sh b/tests/sort/sort-version.sh
similarity index 100%
rename from tests/misc/sort-version.sh
rename to tests/sort/sort-version.sh
diff --git a/tests/misc/sort.pl b/tests/sort/sort.pl
similarity index 100%
rename from tests/misc/sort.pl
rename to tests/sort/sort.pl
diff --git a/tests/misc/stat-birthtime.sh b/tests/stat/stat-birthtime.sh
similarity index 100%
rename from tests/misc/stat-birthtime.sh
rename to tests/stat/stat-birthtime.sh
diff --git a/tests/misc/stat-fmt.sh b/tests/stat/stat-fmt.sh
similarity index 100%
rename from tests/misc/stat-fmt.sh
rename to tests/stat/stat-fmt.sh
diff --git a/tests/misc/stat-hyphen.sh b/tests/stat/stat-hyphen.sh
similarity index 100%
rename from tests/misc/stat-hyphen.sh
rename to tests/stat/stat-hyphen.sh
diff --git a/tests/misc/stat-mount.sh b/tests/stat/stat-mount.sh
similarity index 100%
rename from tests/misc/stat-mount.sh
rename to tests/stat/stat-mount.sh
diff --git a/tests/misc/stat-nanoseconds.sh b/tests/stat/stat-nanoseconds.sh
similarity index 100%
rename from tests/misc/stat-nanoseconds.sh
rename to tests/stat/stat-nanoseconds.sh
diff --git a/tests/misc/stat-printf.pl b/tests/stat/stat-printf.pl
similarity index 100%
rename from tests/misc/stat-printf.pl
rename to tests/stat/stat-printf.pl
diff --git a/tests/misc/stat-slash.sh b/tests/stat/stat-slash.sh
similarity index 100%
rename from tests/misc/stat-slash.sh
rename to tests/stat/stat-slash.sh
diff --git a/tests/misc/stty-invalid.sh b/tests/stty/stty-invalid.sh
similarity index 100%
rename from tests/misc/stty-invalid.sh
rename to tests/stty/stty-invalid.sh
diff --git a/tests/misc/stty-pairs.sh b/tests/stty/stty-pairs.sh
similarity index 100%
rename from tests/misc/stty-pairs.sh
rename to tests/stty/stty-pairs.sh
diff --git a/tests/misc/stty-row-col.sh b/tests/stty/stty-row-col.sh
similarity index 100%
rename from tests/misc/stty-row-col.sh
rename to tests/stty/stty-row-col.sh
diff --git a/tests/misc/stty.sh b/tests/stty/stty.sh
similarity index 100%
rename from tests/misc/stty.sh
rename to tests/stty/stty.sh
diff --git a/tests/misc/tac-2-nonseekable.sh b/tests/tac/tac-2-nonseekable.sh
similarity index 100%
rename from tests/misc/tac-2-nonseekable.sh
rename to tests/tac/tac-2-nonseekable.sh
diff --git a/tests/misc/tac-continue.sh b/tests/tac/tac-continue.sh
similarity index 100%
rename from tests/misc/tac-continue.sh
rename to tests/tac/tac-continue.sh
diff --git a/tests/misc/tac.pl b/tests/tac/tac.pl
similarity index 100%
rename from tests/misc/tac.pl
rename to tests/tac/tac.pl
diff --git a/tests/tail-2/F-headers.sh b/tests/tail/F-headers.sh
similarity index 100%
rename from tests/tail-2/F-headers.sh
rename to tests/tail/F-headers.sh
diff --git a/tests/tail-2/F-vs-missing.sh b/tests/tail/F-vs-missing.sh
similarity index 100%
rename from tests/tail-2/F-vs-missing.sh
rename to tests/tail/F-vs-missing.sh
diff --git a/tests/tail-2/F-vs-rename.sh b/tests/tail/F-vs-rename.sh
similarity index 100%
rename from tests/tail-2/F-vs-rename.sh
rename to tests/tail/F-vs-rename.sh
diff --git a/tests/tail-2/append-only.sh b/tests/tail/append-only.sh
similarity index 100%
rename from tests/tail-2/append-only.sh
rename to tests/tail/append-only.sh
diff --git a/tests/tail-2/assert-2.sh b/tests/tail/assert-2.sh
similarity index 100%
rename from tests/tail-2/assert-2.sh
rename to tests/tail/assert-2.sh
diff --git a/tests/tail-2/assert.sh b/tests/tail/assert.sh
similarity index 100%
rename from tests/tail-2/assert.sh
rename to tests/tail/assert.sh
diff --git a/tests/tail-2/big-4gb.sh b/tests/tail/big-4gb.sh
similarity index 100%
rename from tests/tail-2/big-4gb.sh
rename to tests/tail/big-4gb.sh
diff --git a/tests/tail-2/descriptor-vs-rename.sh b/tests/tail/descriptor-vs-rename.sh
similarity index 100%
rename from tests/tail-2/descriptor-vs-rename.sh
rename to tests/tail/descriptor-vs-rename.sh
diff --git a/tests/tail-2/end-of-device.sh b/tests/tail/end-of-device.sh
similarity index 100%
rename from tests/tail-2/end-of-device.sh
rename to tests/tail/end-of-device.sh
diff --git a/tests/tail-2/flush-initial.sh b/tests/tail/flush-initial.sh
similarity index 100%
rename from tests/tail-2/flush-initial.sh
rename to tests/tail/flush-initial.sh
diff --git a/tests/tail-2/follow-name.sh b/tests/tail/follow-name.sh
similarity index 100%
rename from tests/tail-2/follow-name.sh
rename to tests/tail/follow-name.sh
diff --git a/tests/tail-2/follow-stdin.sh b/tests/tail/follow-stdin.sh
similarity index 100%
rename from tests/tail-2/follow-stdin.sh
rename to tests/tail/follow-stdin.sh
diff --git a/tests/tail-2/inotify-dir-recreate.sh b/tests/tail/inotify-dir-recreate.sh
similarity index 100%
rename from tests/tail-2/inotify-dir-recreate.sh
rename to tests/tail/inotify-dir-recreate.sh
diff --git a/tests/tail-2/inotify-hash-abuse.sh b/tests/tail/inotify-hash-abuse.sh
similarity index 100%
rename from tests/tail-2/inotify-hash-abuse.sh
rename to tests/tail/inotify-hash-abuse.sh
diff --git a/tests/tail-2/inotify-hash-abuse2.sh b/tests/tail/inotify-hash-abuse2.sh
similarity index 100%
rename from tests/tail-2/inotify-hash-abuse2.sh
rename to tests/tail/inotify-hash-abuse2.sh
diff --git a/tests/tail-2/inotify-only-regular.sh b/tests/tail/inotify-only-regular.sh
similarity index 100%
rename from tests/tail-2/inotify-only-regular.sh
rename to tests/tail/inotify-only-regular.sh
diff --git a/tests/tail-2/inotify-race.sh b/tests/tail/inotify-race.sh
similarity index 100%
rename from tests/tail-2/inotify-race.sh
rename to tests/tail/inotify-race.sh
diff --git a/tests/tail-2/inotify-race2.sh b/tests/tail/inotify-race2.sh
similarity index 100%
rename from tests/tail-2/inotify-race2.sh
rename to tests/tail/inotify-race2.sh
diff --git a/tests/tail-2/inotify-rotate-resources.sh b/tests/tail/inotify-rotate-resources.sh
similarity index 100%
rename from tests/tail-2/inotify-rotate-resources.sh
rename to tests/tail/inotify-rotate-resources.sh
diff --git a/tests/tail-2/inotify-rotate.sh b/tests/tail/inotify-rotate.sh
similarity index 100%
rename from tests/tail-2/inotify-rotate.sh
rename to tests/tail/inotify-rotate.sh
diff --git a/tests/tail-2/overlay-headers.sh b/tests/tail/overlay-headers.sh
similarity index 100%
rename from tests/tail-2/overlay-headers.sh
rename to tests/tail/overlay-headers.sh
diff --git a/tests/tail-2/pid.sh b/tests/tail/pid.sh
similarity index 100%
rename from tests/tail-2/pid.sh
rename to tests/tail/pid.sh
diff --git a/tests/tail-2/pipe-f.sh b/tests/tail/pipe-f.sh
similarity index 100%
rename from tests/tail-2/pipe-f.sh
rename to tests/tail/pipe-f.sh
diff --git a/tests/tail-2/pipe-f2.sh b/tests/tail/pipe-f2.sh
similarity index 100%
rename from tests/tail-2/pipe-f2.sh
rename to tests/tail/pipe-f2.sh
diff --git a/tests/tail-2/proc-ksyms.sh b/tests/tail/proc-ksyms.sh
similarity index 100%
rename from tests/tail-2/proc-ksyms.sh
rename to tests/tail/proc-ksyms.sh
diff --git a/tests/tail-2/retry.sh b/tests/tail/retry.sh
similarity index 100%
rename from tests/tail-2/retry.sh
rename to tests/tail/retry.sh
diff --git a/tests/tail-2/start-middle.sh b/tests/tail/start-middle.sh
similarity index 100%
rename from tests/tail-2/start-middle.sh
rename to tests/tail/start-middle.sh
diff --git a/tests/tail-2/symlink.sh b/tests/tail/symlink.sh
similarity index 100%
rename from tests/tail-2/symlink.sh
rename to tests/tail/symlink.sh
diff --git a/tests/tail-2/tail-c.sh b/tests/tail/tail-c.sh
similarity index 100%
rename from tests/tail-2/tail-c.sh
rename to tests/tail/tail-c.sh
diff --git a/tests/tail-2/tail-n0f.sh b/tests/tail/tail-n0f.sh
similarity index 100%
rename from tests/tail-2/tail-n0f.sh
rename to tests/tail/tail-n0f.sh
diff --git a/tests/misc/tail.pl b/tests/tail/tail.pl
similarity index 100%
rename from tests/misc/tail.pl
rename to tests/tail/tail.pl
diff --git a/tests/tail-2/truncate.sh b/tests/tail/truncate.sh
similarity index 100%
rename from tests/tail-2/truncate.sh
rename to tests/tail/truncate.sh
diff --git a/tests/tail-2/wait.sh b/tests/tail/wait.sh
similarity index 100%
rename from tests/tail-2/wait.sh
rename to tests/tail/wait.sh
diff --git a/tests/misc/test-N.sh b/tests/test/test-N.sh
similarity index 100%
rename from tests/misc/test-N.sh
rename to tests/test/test-N.sh
diff --git a/tests/misc/test-diag.pl b/tests/test/test-diag.pl
similarity index 100%
rename from tests/misc/test-diag.pl
rename to tests/test/test-diag.pl
diff --git a/tests/misc/test.pl b/tests/test/test.pl
similarity index 100%
rename from tests/misc/test.pl
rename to tests/test/test.pl
diff --git a/tests/misc/timeout-blocked.pl b/tests/timeout/timeout-blocked.pl
similarity index 100%
rename from tests/misc/timeout-blocked.pl
rename to tests/timeout/timeout-blocked.pl
diff --git a/tests/misc/timeout-group.sh b/tests/timeout/timeout-group.sh
similarity index 100%
rename from tests/misc/timeout-group.sh
rename to tests/timeout/timeout-group.sh
diff --git a/tests/misc/timeout-large-parameters.sh b/tests/timeout/timeout-large-parameters.sh
similarity index 100%
rename from tests/misc/timeout-large-parameters.sh
rename to tests/timeout/timeout-large-parameters.sh
diff --git a/tests/misc/timeout-parameters.sh b/tests/timeout/timeout-parameters.sh
similarity index 100%
rename from tests/misc/timeout-parameters.sh
rename to tests/timeout/timeout-parameters.sh
diff --git a/tests/misc/timeout.sh b/tests/timeout/timeout.sh
similarity index 100%
rename from tests/misc/timeout.sh
rename to tests/timeout/timeout.sh
diff --git a/tests/misc/tr-case-class.sh b/tests/tr/tr-case-class.sh
similarity index 100%
rename from tests/misc/tr-case-class.sh
rename to tests/tr/tr-case-class.sh
diff --git a/tests/misc/tr.pl b/tests/tr/tr.pl
similarity index 100%
rename from tests/misc/tr.pl
rename to tests/tr/tr.pl
diff --git a/tests/misc/truncate-dangling-symlink.sh b/tests/truncate/truncate-dangling-symlink.sh
similarity index 100%
rename from tests/misc/truncate-dangling-symlink.sh
rename to tests/truncate/truncate-dangling-symlink.sh
diff --git a/tests/misc/truncate-dir-fail.sh b/tests/truncate/truncate-dir-fail.sh
similarity index 100%
rename from tests/misc/truncate-dir-fail.sh
rename to tests/truncate/truncate-dir-fail.sh
diff --git a/tests/misc/truncate-fail-diag.sh b/tests/truncate/truncate-fail-diag.sh
similarity index 100%
rename from tests/misc/truncate-fail-diag.sh
rename to tests/truncate/truncate-fail-diag.sh
diff --git a/tests/misc/truncate-fifo.sh b/tests/truncate/truncate-fifo.sh
similarity index 100%
rename from tests/misc/truncate-fifo.sh
rename to tests/truncate/truncate-fifo.sh
diff --git a/tests/misc/truncate-no-create-missing.sh b/tests/truncate/truncate-no-create-missing.sh
similarity index 100%
rename from tests/misc/truncate-no-create-missing.sh
rename to tests/truncate/truncate-no-create-missing.sh
diff --git a/tests/misc/truncate-overflow.sh b/tests/truncate/truncate-overflow.sh
similarity index 100%
rename from tests/misc/truncate-overflow.sh
rename to tests/truncate/truncate-overflow.sh
diff --git a/tests/misc/truncate-owned-by-other.sh b/tests/truncate/truncate-owned-by-other.sh
similarity index 100%
rename from tests/misc/truncate-owned-by-other.sh
rename to tests/truncate/truncate-owned-by-other.sh
diff --git a/tests/misc/truncate-parameters.sh b/tests/truncate/truncate-parameters.sh
similarity index 100%
rename from tests/misc/truncate-parameters.sh
rename to tests/truncate/truncate-parameters.sh
diff --git a/tests/misc/truncate-relative.sh b/tests/truncate/truncate-relative.sh
similarity index 100%
rename from tests/misc/truncate-relative.sh
rename to tests/truncate/truncate-relative.sh
diff --git a/tests/misc/tty-eof.pl b/tests/tty/tty-eof.pl
similarity index 100%
rename from tests/misc/tty-eof.pl
rename to tests/tty/tty-eof.pl
diff --git a/tests/misc/tty.sh b/tests/tty/tty.sh
similarity index 100%
rename from tests/misc/tty.sh
rename to tests/tty/tty.sh
diff --git a/tests/misc/uniq-collate.sh b/tests/uniq/uniq-collate.sh
similarity index 100%
rename from tests/misc/uniq-collate.sh
rename to tests/uniq/uniq-collate.sh
diff --git a/tests/misc/uniq-perf.sh b/tests/uniq/uniq-perf.sh
similarity index 100%
rename from tests/misc/uniq-perf.sh
rename to tests/uniq/uniq-perf.sh
diff --git a/tests/misc/uniq.pl b/tests/uniq/uniq.pl
similarity index 100%
rename from tests/misc/uniq.pl
rename to tests/uniq/uniq.pl
diff --git a/tests/misc/wc-files0-from.pl b/tests/wc/wc-files0-from.pl
similarity index 100%
rename from tests/misc/wc-files0-from.pl
rename to tests/wc/wc-files0-from.pl
diff --git a/tests/misc/wc-files0.sh b/tests/wc/wc-files0.sh
similarity index 100%
rename from tests/misc/wc-files0.sh
rename to tests/wc/wc-files0.sh
diff --git a/tests/misc/wc-nbsp.sh b/tests/wc/wc-nbsp.sh
similarity index 100%
rename from tests/misc/wc-nbsp.sh
rename to tests/wc/wc-nbsp.sh
diff --git a/tests/misc/wc-parallel.sh b/tests/wc/wc-parallel.sh
similarity index 100%
rename from tests/misc/wc-parallel.sh
rename to tests/wc/wc-parallel.sh
diff --git a/tests/misc/wc-proc.sh b/tests/wc/wc-proc.sh
similarity index 100%
rename from tests/misc/wc-proc.sh
rename to tests/wc/wc-proc.sh
diff --git a/tests/misc/wc-total.sh b/tests/wc/wc-total.sh
similarity index 100%
rename from tests/misc/wc-total.sh
rename to tests/wc/wc-total.sh
diff --git a/tests/misc/wc.pl b/tests/wc/wc.pl
similarity index 100%
rename from tests/misc/wc.pl
rename to tests/wc/wc.pl