diff --git a/test/author-reordering b/test/author-order
similarity index 100%
rename from test/author-reordering
rename to test/author-order
diff --git a/test/encoding-issues b/test/encoding
similarity index 100%
rename from test/encoding-issues
rename to test/encoding
diff --git a/test/from-line-heuristics b/test/from-guessing
similarity index 100%
rename from test/from-line-heuristics
rename to test/from-guessing
diff --git a/test/long-msgid b/test/long-id
similarity index 100%
rename from test/long-msgid
rename to test/long-id
diff --git a/test/notmuch-test b/test/notmuch-test
index 294c3fd7..fc1a66bf 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -8,7 +8,7 @@
 
 cd $(dirname "$0")
 
-TESTS="basic new search json thread-naming reply dump-restore uuencode threading-out-of-order author-reordering from-line-heuristics long-msgid encoding-issues"
+TESTS="basic new search json thread-naming reply dump-restore uuencode thread-order author-order from-guessing long-id encoding"
 
 # Clean up any results from a previous run
 rm -r test-results >/dev/null 2>/dev/null
diff --git a/test/test-lib.sh b/test/test-lib.sh
index b21b4358..7688fe0e 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -154,7 +154,7 @@ then
 	exit 0
 fi
 
-echo "Testing ${test_description}"
+echo $(basename "$0"): "Testing ${test_description}"
 
 exec 5>&1
 if test "$verbose" = "t"
diff --git a/test/threading-out-of-order b/test/thread-order
similarity index 100%
rename from test/threading-out-of-order
rename to test/thread-order