diff --git a/tests/test_arch.rs b/tests/by-util/test_arch.rs
similarity index 100%
rename from tests/test_arch.rs
rename to tests/by-util/test_arch.rs
diff --git a/tests/test_base32.rs b/tests/by-util/test_base32.rs
similarity index 100%
rename from tests/test_base32.rs
rename to tests/by-util/test_base32.rs
diff --git a/tests/test_base64.rs b/tests/by-util/test_base64.rs
similarity index 100%
rename from tests/test_base64.rs
rename to tests/by-util/test_base64.rs
diff --git a/tests/test_basename.rs b/tests/by-util/test_basename.rs
similarity index 100%
rename from tests/test_basename.rs
rename to tests/by-util/test_basename.rs
diff --git a/tests/test_cat.rs b/tests/by-util/test_cat.rs
similarity index 100%
rename from tests/test_cat.rs
rename to tests/by-util/test_cat.rs
diff --git a/tests/test_chgrp.rs b/tests/by-util/test_chgrp.rs
similarity index 100%
rename from tests/test_chgrp.rs
rename to tests/by-util/test_chgrp.rs
diff --git a/tests/test_chmod.rs b/tests/by-util/test_chmod.rs
similarity index 100%
rename from tests/test_chmod.rs
rename to tests/by-util/test_chmod.rs
diff --git a/tests/test_chown.rs b/tests/by-util/test_chown.rs
similarity index 100%
rename from tests/test_chown.rs
rename to tests/by-util/test_chown.rs
diff --git a/tests/test_cksum.rs b/tests/by-util/test_cksum.rs
similarity index 100%
rename from tests/test_cksum.rs
rename to tests/by-util/test_cksum.rs
diff --git a/tests/test_comm.rs b/tests/by-util/test_comm.rs
similarity index 100%
rename from tests/test_comm.rs
rename to tests/by-util/test_comm.rs
diff --git a/tests/test_cp.rs b/tests/by-util/test_cp.rs
similarity index 100%
rename from tests/test_cp.rs
rename to tests/by-util/test_cp.rs
diff --git a/tests/test_cut.rs b/tests/by-util/test_cut.rs
similarity index 100%
rename from tests/test_cut.rs
rename to tests/by-util/test_cut.rs
diff --git a/tests/test_date.rs b/tests/by-util/test_date.rs
similarity index 100%
rename from tests/test_date.rs
rename to tests/by-util/test_date.rs
diff --git a/tests/test_df.rs b/tests/by-util/test_df.rs
similarity index 100%
rename from tests/test_df.rs
rename to tests/by-util/test_df.rs
diff --git a/tests/test_dircolors.rs b/tests/by-util/test_dircolors.rs
similarity index 100%
rename from tests/test_dircolors.rs
rename to tests/by-util/test_dircolors.rs
diff --git a/tests/test_dirname.rs b/tests/by-util/test_dirname.rs
similarity index 100%
rename from tests/test_dirname.rs
rename to tests/by-util/test_dirname.rs
diff --git a/tests/test_du.rs b/tests/by-util/test_du.rs
similarity index 100%
rename from tests/test_du.rs
rename to tests/by-util/test_du.rs
diff --git a/tests/test_echo.rs b/tests/by-util/test_echo.rs
similarity index 100%
rename from tests/test_echo.rs
rename to tests/by-util/test_echo.rs
diff --git a/tests/test_env.rs b/tests/by-util/test_env.rs
similarity index 100%
rename from tests/test_env.rs
rename to tests/by-util/test_env.rs
diff --git a/tests/test_expand.rs b/tests/by-util/test_expand.rs
similarity index 100%
rename from tests/test_expand.rs
rename to tests/by-util/test_expand.rs
diff --git a/tests/test_expr.rs b/tests/by-util/test_expr.rs
similarity index 100%
rename from tests/test_expr.rs
rename to tests/by-util/test_expr.rs
diff --git a/tests/test_factor.rs b/tests/by-util/test_factor.rs
similarity index 100%
rename from tests/test_factor.rs
rename to tests/by-util/test_factor.rs
diff --git a/tests/test_false.rs b/tests/by-util/test_false.rs
similarity index 100%
rename from tests/test_false.rs
rename to tests/by-util/test_false.rs
diff --git a/tests/test_fmt.rs b/tests/by-util/test_fmt.rs
similarity index 100%
rename from tests/test_fmt.rs
rename to tests/by-util/test_fmt.rs
diff --git a/tests/test_fold.rs b/tests/by-util/test_fold.rs
similarity index 100%
rename from tests/test_fold.rs
rename to tests/by-util/test_fold.rs
diff --git a/tests/test_hashsum.rs b/tests/by-util/test_hashsum.rs
similarity index 100%
rename from tests/test_hashsum.rs
rename to tests/by-util/test_hashsum.rs
diff --git a/tests/test_head.rs b/tests/by-util/test_head.rs
similarity index 100%
rename from tests/test_head.rs
rename to tests/by-util/test_head.rs
diff --git a/tests/test_hostname.rs b/tests/by-util/test_hostname.rs
similarity index 100%
rename from tests/test_hostname.rs
rename to tests/by-util/test_hostname.rs
diff --git a/tests/test_id.rs b/tests/by-util/test_id.rs
similarity index 100%
rename from tests/test_id.rs
rename to tests/by-util/test_id.rs
diff --git a/tests/test_install.rs b/tests/by-util/test_install.rs
similarity index 100%
rename from tests/test_install.rs
rename to tests/by-util/test_install.rs
diff --git a/tests/test_join.rs b/tests/by-util/test_join.rs
similarity index 100%
rename from tests/test_join.rs
rename to tests/by-util/test_join.rs
diff --git a/tests/test_link.rs b/tests/by-util/test_link.rs
similarity index 100%
rename from tests/test_link.rs
rename to tests/by-util/test_link.rs
diff --git a/tests/test_ln.rs b/tests/by-util/test_ln.rs
similarity index 100%
rename from tests/test_ln.rs
rename to tests/by-util/test_ln.rs
diff --git a/tests/test_ls.rs b/tests/by-util/test_ls.rs
similarity index 100%
rename from tests/test_ls.rs
rename to tests/by-util/test_ls.rs
diff --git a/tests/test_mkdir.rs b/tests/by-util/test_mkdir.rs
similarity index 100%
rename from tests/test_mkdir.rs
rename to tests/by-util/test_mkdir.rs
diff --git a/tests/test_mktemp.rs b/tests/by-util/test_mktemp.rs
similarity index 100%
rename from tests/test_mktemp.rs
rename to tests/by-util/test_mktemp.rs
diff --git a/tests/test_more.rs b/tests/by-util/test_more.rs
similarity index 100%
rename from tests/test_more.rs
rename to tests/by-util/test_more.rs
diff --git a/tests/test_mv.rs b/tests/by-util/test_mv.rs
similarity index 100%
rename from tests/test_mv.rs
rename to tests/by-util/test_mv.rs
diff --git a/tests/test_nl.rs b/tests/by-util/test_nl.rs
similarity index 100%
rename from tests/test_nl.rs
rename to tests/by-util/test_nl.rs
diff --git a/tests/test_numfmt.rs b/tests/by-util/test_numfmt.rs
similarity index 100%
rename from tests/test_numfmt.rs
rename to tests/by-util/test_numfmt.rs
diff --git a/tests/test_od.rs b/tests/by-util/test_od.rs
similarity index 100%
rename from tests/test_od.rs
rename to tests/by-util/test_od.rs
diff --git a/tests/test_paste.rs b/tests/by-util/test_paste.rs
similarity index 100%
rename from tests/test_paste.rs
rename to tests/by-util/test_paste.rs
diff --git a/tests/test_pathchk.rs b/tests/by-util/test_pathchk.rs
similarity index 100%
rename from tests/test_pathchk.rs
rename to tests/by-util/test_pathchk.rs
diff --git a/tests/test_pinky.rs b/tests/by-util/test_pinky.rs
similarity index 100%
rename from tests/test_pinky.rs
rename to tests/by-util/test_pinky.rs
diff --git a/tests/test_printenv.rs b/tests/by-util/test_printenv.rs
similarity index 100%
rename from tests/test_printenv.rs
rename to tests/by-util/test_printenv.rs
diff --git a/tests/test_printf.rs b/tests/by-util/test_printf.rs
similarity index 100%
rename from tests/test_printf.rs
rename to tests/by-util/test_printf.rs
diff --git a/tests/test_ptx.rs b/tests/by-util/test_ptx.rs
similarity index 100%
rename from tests/test_ptx.rs
rename to tests/by-util/test_ptx.rs
diff --git a/tests/test_pwd.rs b/tests/by-util/test_pwd.rs
similarity index 100%
rename from tests/test_pwd.rs
rename to tests/by-util/test_pwd.rs
diff --git a/tests/test_readlink.rs b/tests/by-util/test_readlink.rs
similarity index 100%
rename from tests/test_readlink.rs
rename to tests/by-util/test_readlink.rs
diff --git a/tests/test_realpath.rs b/tests/by-util/test_realpath.rs
similarity index 100%
rename from tests/test_realpath.rs
rename to tests/by-util/test_realpath.rs
diff --git a/tests/test_rm.rs b/tests/by-util/test_rm.rs
similarity index 100%
rename from tests/test_rm.rs
rename to tests/by-util/test_rm.rs
diff --git a/tests/test_rmdir.rs b/tests/by-util/test_rmdir.rs
similarity index 100%
rename from tests/test_rmdir.rs
rename to tests/by-util/test_rmdir.rs
diff --git a/tests/test_seq.rs b/tests/by-util/test_seq.rs
similarity index 100%
rename from tests/test_seq.rs
rename to tests/by-util/test_seq.rs
diff --git a/tests/test_sort.rs b/tests/by-util/test_sort.rs
similarity index 100%
rename from tests/test_sort.rs
rename to tests/by-util/test_sort.rs
diff --git a/tests/test_split.rs b/tests/by-util/test_split.rs
similarity index 100%
rename from tests/test_split.rs
rename to tests/by-util/test_split.rs
diff --git a/tests/test_stat.rs b/tests/by-util/test_stat.rs
similarity index 100%
rename from tests/test_stat.rs
rename to tests/by-util/test_stat.rs
diff --git a/tests/test_stdbuf.rs b/tests/by-util/test_stdbuf.rs
similarity index 100%
rename from tests/test_stdbuf.rs
rename to tests/by-util/test_stdbuf.rs
diff --git a/tests/test_sum.rs b/tests/by-util/test_sum.rs
similarity index 100%
rename from tests/test_sum.rs
rename to tests/by-util/test_sum.rs
diff --git a/tests/test_tac.rs b/tests/by-util/test_tac.rs
similarity index 100%
rename from tests/test_tac.rs
rename to tests/by-util/test_tac.rs
diff --git a/tests/test_tail.rs b/tests/by-util/test_tail.rs
similarity index 100%
rename from tests/test_tail.rs
rename to tests/by-util/test_tail.rs
diff --git a/tests/test_test.rs b/tests/by-util/test_test.rs
similarity index 100%
rename from tests/test_test.rs
rename to tests/by-util/test_test.rs
diff --git a/tests/test_touch.rs b/tests/by-util/test_touch.rs
similarity index 100%
rename from tests/test_touch.rs
rename to tests/by-util/test_touch.rs
diff --git a/tests/test_tr.rs b/tests/by-util/test_tr.rs
similarity index 100%
rename from tests/test_tr.rs
rename to tests/by-util/test_tr.rs
diff --git a/tests/test_true.rs b/tests/by-util/test_true.rs
similarity index 100%
rename from tests/test_true.rs
rename to tests/by-util/test_true.rs
diff --git a/tests/test_truncate.rs b/tests/by-util/test_truncate.rs
similarity index 100%
rename from tests/test_truncate.rs
rename to tests/by-util/test_truncate.rs
diff --git a/tests/test_tsort.rs b/tests/by-util/test_tsort.rs
similarity index 100%
rename from tests/test_tsort.rs
rename to tests/by-util/test_tsort.rs
diff --git a/tests/test_uname.rs b/tests/by-util/test_uname.rs
similarity index 100%
rename from tests/test_uname.rs
rename to tests/by-util/test_uname.rs
diff --git a/tests/test_unexpand.rs b/tests/by-util/test_unexpand.rs
similarity index 100%
rename from tests/test_unexpand.rs
rename to tests/by-util/test_unexpand.rs
diff --git a/tests/test_uniq.rs b/tests/by-util/test_uniq.rs
similarity index 100%
rename from tests/test_uniq.rs
rename to tests/by-util/test_uniq.rs
diff --git a/tests/test_unlink.rs b/tests/by-util/test_unlink.rs
similarity index 100%
rename from tests/test_unlink.rs
rename to tests/by-util/test_unlink.rs
diff --git a/tests/test_uptime.rs b/tests/by-util/test_uptime.rs
similarity index 100%
rename from tests/test_uptime.rs
rename to tests/by-util/test_uptime.rs
diff --git a/tests/test_users.rs b/tests/by-util/test_users.rs
similarity index 100%
rename from tests/test_users.rs
rename to tests/by-util/test_users.rs
diff --git a/tests/test_wc.rs b/tests/by-util/test_wc.rs
similarity index 100%
rename from tests/test_wc.rs
rename to tests/by-util/test_wc.rs
diff --git a/tests/test_who.rs b/tests/by-util/test_who.rs
similarity index 100%
rename from tests/test_who.rs
rename to tests/by-util/test_who.rs
diff --git a/tests/test_whoami.rs b/tests/by-util/test_whoami.rs
similarity index 100%
rename from tests/test_whoami.rs
rename to tests/by-util/test_whoami.rs