diff --git a/tests/help/document -f b/tests/Command-line help contents/The -f flag should be documented.
similarity index 100%
rename from tests/help/document -f
rename to tests/Command-line help contents/The -f flag should be documented.
diff --git a/tests/help/exit 0 on explicit help b/tests/Command-line help contents/Urchin should exit 0 if run with the -h flag.
similarity index 100%
rename from tests/help/exit 0 on explicit help
rename to tests/Command-line help contents/Urchin should exit 0 if run with the -h flag.
diff --git a/tests/help/exit 1 on implicit help b/tests/Command-line help contents/Urchin should exit 1 if help is displayed without being requested.
similarity index 100%
rename from tests/help/exit 1 on implicit help
rename to tests/Command-line help contents/Urchin should exit 1 if help is displayed without being requested.
diff --git a/tests/help/document xsd b/tests/Command-line help contents/XSD output (-xsd flag) should be documented.
similarity index 100%
rename from tests/help/document xsd
rename to tests/Command-line help contents/XSD output (-xsd flag) should be documented.
diff --git a/tests/counting/.test/faila b/tests/Counts should be kept of successes and failures./.test/faila
similarity index 100%
rename from tests/counting/.test/faila
rename to tests/Counts should be kept of successes and failures./.test/faila
diff --git a/tests/counting/.test/failb b/tests/Counts should be kept of successes and failures./.test/failb
similarity index 100%
rename from tests/counting/.test/failb
rename to tests/Counts should be kept of successes and failures./.test/failb
diff --git a/tests/counting/.test/failc b/tests/Counts should be kept of successes and failures./.test/failc
similarity index 100%
rename from tests/counting/.test/failc
rename to tests/Counts should be kept of successes and failures./.test/failc
diff --git a/tests/counting/.test/passa b/tests/Counts should be kept of successes and failures./.test/passa
similarity index 100%
rename from tests/counting/.test/passa
rename to tests/Counts should be kept of successes and failures./.test/passa
diff --git a/tests/counting/.test/passb b/tests/Counts should be kept of successes and failures./.test/passb
similarity index 100%
rename from tests/counting/.test/passb
rename to tests/Counts should be kept of successes and failures./.test/passb
diff --git a/tests/counting/.test/passc b/tests/Counts should be kept of successes and failures./.test/passc
similarity index 100%
rename from tests/counting/.test/passc
rename to tests/Counts should be kept of successes and failures./.test/passc
diff --git a/tests/counting/.test/passd b/tests/Counts should be kept of successes and failures./.test/passd
similarity index 100%
rename from tests/counting/.test/passd
rename to tests/Counts should be kept of successes and failures./.test/passd
diff --git a/tests/counting/.test/passe b/tests/Counts should be kept of successes and failures./.test/passe
similarity index 100%
rename from tests/counting/.test/passe
rename to tests/Counts should be kept of successes and failures./.test/passe
diff --git a/tests/counting/.test/passf b/tests/Counts should be kept of successes and failures./.test/passf
similarity index 100%
rename from tests/counting/.test/passf
rename to tests/Counts should be kept of successes and failures./.test/passf
diff --git a/tests/counting/.test/passg b/tests/Counts should be kept of successes and failures./.test/passg
similarity index 100%
rename from tests/counting/.test/passg
rename to tests/Counts should be kept of successes and failures./.test/passg
diff --git a/tests/counting/seven_successes b/tests/Counts should be kept of successes and failures./There should be seven successes.
similarity index 100%
rename from tests/counting/seven_successes
rename to tests/Counts should be kept of successes and failures./There should be seven successes.
diff --git a/tests/counting/three_failures b/tests/Counts should be kept of successes and failures./There should be three failures.
similarity index 100%
rename from tests/counting/three_failures
rename to tests/Counts should be kept of successes and failures./There should be three failures.
diff --git a/tests/flags/filename/.chainsaw/successful test b/tests/Exit codes of zero should pass.
old mode 100644
new mode 100755
similarity index 100%
rename from tests/flags/filename/.chainsaw/successful test
rename to tests/Exit codes of zero should pass.
diff --git a/tests/failures fail b/tests/Failing tests should be marked in red.
similarity index 100%
rename from tests/failures fail
rename to tests/Failing tests should be marked in red.
diff --git a/tests/setup_teardown/.test/setup b/tests/Setup and teardown/.test/setup
similarity index 100%
rename from tests/setup_teardown/.test/setup
rename to tests/Setup and teardown/.test/setup
diff --git a/tests/setup_teardown/.test/setup has run twice a b/tests/Setup and teardown/.test/setup has run twice a
similarity index 100%
rename from tests/setup_teardown/.test/setup has run twice a
rename to tests/Setup and teardown/.test/setup has run twice a
diff --git a/tests/setup_teardown/.test/setup has run twice b b/tests/Setup and teardown/.test/setup has run twice b
similarity index 100%
rename from tests/setup_teardown/.test/setup has run twice b
rename to tests/Setup and teardown/.test/setup has run twice b
diff --git a/tests/setup_teardown/.test/setup_dir b/tests/Setup and teardown/.test/setup_dir
similarity index 100%
rename from tests/setup_teardown/.test/setup_dir
rename to tests/Setup and teardown/.test/setup_dir
diff --git a/tests/setup_teardown/.test/setup_dir runs b/tests/Setup and teardown/.test/setup_dir runs
similarity index 100%
rename from tests/setup_teardown/.test/setup_dir runs
rename to tests/Setup and teardown/.test/setup_dir runs
diff --git a/tests/setup_teardown/.test/setup_dir runs only oncea b/tests/Setup and teardown/.test/setup_dir runs only oncea
similarity index 100%
rename from tests/setup_teardown/.test/setup_dir runs only oncea
rename to tests/Setup and teardown/.test/setup_dir runs only oncea
diff --git a/tests/setup_teardown/.test/setup_dir runs only onceb b/tests/Setup and teardown/.test/setup_dir runs only onceb
similarity index 100%
rename from tests/setup_teardown/.test/setup_dir runs only onceb
rename to tests/Setup and teardown/.test/setup_dir runs only onceb
diff --git a/tests/setup_teardown/.test/teardown b/tests/Setup and teardown/.test/teardown
similarity index 100%
rename from tests/setup_teardown/.test/teardown
rename to tests/Setup and teardown/.test/teardown
diff --git a/tests/setup_teardown/.test/teardown has run twice a b/tests/Setup and teardown/.test/teardown has run twice a
similarity index 100%
rename from tests/setup_teardown/.test/teardown has run twice a
rename to tests/Setup and teardown/.test/teardown has run twice a
diff --git a/tests/setup_teardown/.test/teardown has run twice b b/tests/Setup and teardown/.test/teardown has run twice b
similarity index 100%
rename from tests/setup_teardown/.test/teardown has run twice b
rename to tests/Setup and teardown/.test/teardown has run twice b
diff --git a/tests/setup_teardown/.test/teardown_dir b/tests/Setup and teardown/.test/teardown_dir
similarity index 100%
rename from tests/setup_teardown/.test/teardown_dir
rename to tests/Setup and teardown/.test/teardown_dir
diff --git a/tests/setup_teardown/count runs b/tests/Setup and teardown/_dir files should be run once per directory, and the others should be run once per file.
similarity index 100%
rename from tests/setup_teardown/count runs
rename to tests/Setup and teardown/_dir files should be run once per directory, and the others should be run once per file.
diff --git a/tests/success succeed b/tests/Succeeding tests should be marked in green.
similarity index 100%
rename from tests/success succeed
rename to tests/Succeeding tests should be marked in green.
diff --git a/tests/setup-should-not-be-sourced/check-variable b/tests/The setup script should not be sourced./A variable exported from setup should not be visible in an associated test script.
similarity index 100%
rename from tests/setup-should-not-be-sourced/check-variable
rename to tests/The setup script should not be sourced./A variable exported from setup should not be visible in an associated test script.
diff --git a/tests/setup-should-not-be-sourced/setup b/tests/The setup script should not be sourced./setup
similarity index 100%
rename from tests/setup-should-not-be-sourced/setup
rename to tests/The setup script should not be sourced./setup
diff --git a/tests/flags/filename/.test/successful test b/tests/Urchin should do a sanity check so that directories like the user home are not specified as tests./.chainsaw/successful test
similarity index 100%
rename from tests/flags/filename/.test/successful test
rename to tests/Urchin should do a sanity check so that directories like the user home are not specified as tests./.chainsaw/successful test
diff --git a/tests/test_zero b/tests/Urchin should do a sanity check so that directories like the user home are not specified as tests./.test/successful test
old mode 100755
new mode 100644
similarity index 100%
rename from tests/test_zero
rename to tests/Urchin should do a sanity check so that directories like the user home are not specified as tests./.test/successful test
diff --git a/tests/flags/filename/no molly guard if named test b/tests/Urchin should do a sanity check so that directories like the user home are not specified as tests./no molly guard if named test
similarity index 100%
rename from tests/flags/filename/no molly guard if named test
rename to tests/Urchin should do a sanity check so that directories like the user home are not specified as tests./no molly guard if named test
diff --git a/tests/flags/filename/override b/tests/Urchin should do a sanity check so that directories like the user home are not specified as tests./override
similarity index 100%
rename from tests/flags/filename/override
rename to tests/Urchin should do a sanity check so that directories like the user home are not specified as tests./override
diff --git a/tests/flags/filename/warn on non-test b/tests/Urchin should do a sanity check so that directories like the user home are not specified as tests./warn on non-test
similarity index 100%
rename from tests/flags/filename/warn on non-test
rename to tests/Urchin should do a sanity check so that directories like the user home are not specified as tests./warn on non-test
diff --git a/tests/test_filesystem/test_bin_exists b/tests/Urchin should recognize that the filesystem is sane./The bin directory should exist.
similarity index 100%
rename from tests/test_filesystem/test_bin_exists
rename to tests/Urchin should recognize that the filesystem is sane./The bin directory should exist.
diff --git a/tests/test_filesystem/test_blah_in_file "b/tests/Urchin should recognize that the filesystem is sane./The file \"bladyblah\" should contain the phrase \"blah\"."
similarity index 100%
rename from tests/test_filesystem/test_blah_in_file
rename to "tests/Urchin should recognize that the filesystem is sane./The file \"bladyblah\" should contain the phrase \"blah\"."
diff --git a/tests/test_filesystem/test_root_exists b/tests/Urchin should recognize that the filesystem is sane./The filesystem root directory should exist.
similarity index 100%
rename from tests/test_filesystem/test_root_exists
rename to tests/Urchin should recognize that the filesystem is sane./The filesystem root directory should exist.
diff --git a/tests/test_filesystem/test_no_aoeuaoeuaoeu "b/tests/Urchin should recognize that the filesystem is sane./The filesystem route should contain no \"aoeuaoeuaoeu\" file."
similarity index 100%
rename from tests/test_filesystem/test_no_aoeuaoeuaoeu
rename to "tests/Urchin should recognize that the filesystem is sane./The filesystem route should contain no \"aoeuaoeuaoeu\" file."
diff --git a/tests/test_filesystem/fixtures/bladyblah b/tests/Urchin should recognize that the filesystem is sane./fixtures/bladyblah
similarity index 100%
rename from tests/test_filesystem/fixtures/bladyblah
rename to tests/Urchin should recognize that the filesystem is sane./fixtures/bladyblah
diff --git a/tests/flags/xsd/.fixture/fail b/tests/XSD output should work./.fixture/fail
similarity index 100%
rename from tests/flags/xsd/.fixture/fail
rename to tests/XSD output should work./.fixture/fail
diff --git a/tests/flags/xsd/.fixture/pass b/tests/XSD output should work./.fixture/pass
similarity index 100%
rename from tests/flags/xsd/.fixture/pass
rename to tests/XSD output should work./.fixture/pass
diff --git a/tests/flags/xsd/produces xml b/tests/XSD output should work./XSD output should produce XML.
similarity index 100%
rename from tests/flags/xsd/produces xml
rename to tests/XSD output should work./XSD output should produce XML.