diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 46ff7345..052a4582 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 2008-2013 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+## Copyright (C) 2008-2015 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 ##
 ## This program is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by the
@@ -131,32 +131,57 @@ EXTRA_DIST=						\
 	testdir2/wom_bat/cur/rfc822.1			\
 	testdir2/wom_bat/cur/rfc822.2			\
 	testdir3/cycle					\
-        testdir3/cycle/new/.noindex			\
-        testdir3/cycle/cur/rogue0			\
-        testdir3/cycle/cur/cycle0			\
-        testdir3/cycle/cur/cycle0.0			\
-        testdir3/cycle/cur/cycle0.0.0			\
-        testdir3/cycle/tmp/.noindex			\
-        testdir3/tree/new/.noindex			\
-        testdir3/tree/cur/child0.0			\
-        testdir3/tree/cur/child4.0			\
-        testdir3/tree/cur/root2				\
-        testdir3/tree/cur/root1				\
-        testdir3/tree/cur/child3.0.0.0.0		\
-        testdir3/tree/cur/root0				\
-        testdir3/tree/cur/child2.0.0			\
-        testdir3/tree/cur/child0.1			\
-        testdir3/tree/cur/child0.1.0			\
-        testdir3/tree/cur/child4.1			\
-        testdir3/tree/tmp/.noindex			\
+	testdir3/cycle/new/.noindex			\
+	testdir3/cycle/cur/rogue0			\
+	testdir3/cycle/cur/cycle0			\
+	testdir3/cycle/cur/cycle0.0			\
+	testdir3/cycle/cur/cycle0.0.0			\
+	testdir3/cycle/tmp/.noindex			\
+	testdir3/tree/new/.noindex			\
+	testdir3/tree/cur/child0.0			\
+	testdir3/tree/cur/child4.0			\
+	testdir3/tree/cur/root2				\
+	testdir3/tree/cur/root1				\
+	testdir3/tree/cur/child3.0.0.0.0		\
+	testdir3/tree/cur/root0				\
+	testdir3/tree/cur/child2.0.0			\
+	testdir3/tree/cur/child0.1			\
+	testdir3/tree/cur/child0.1.0			\
+	testdir3/tree/cur/child4.1			\
+	testdir3/tree/tmp/.noindex			\
+	testdir3/sort/1st-child-promotes-thread/cur/A	\
+	testdir3/sort/1st-child-promotes-thread/cur/B	\
+	testdir3/sort/1st-child-promotes-thread/cur/C	\
+	testdir3/sort/1st-child-promotes-thread/cur/D	\
+	testdir3/sort/2nd-child-promotes-thread/cur/A	\
+	testdir3/sort/2nd-child-promotes-thread/cur/B	\
+	testdir3/sort/2nd-child-promotes-thread/cur/C	\
+	testdir3/sort/2nd-child-promotes-thread/cur/D	\
+	testdir3/sort/2nd-child-promotes-thread/cur/E	\
+	testdir3/sort/child-does-not-promote-thread/cur/A	\
+	testdir3/sort/child-does-not-promote-thread/cur/X	\
+	testdir3/sort/child-does-not-promote-thread/cur/Y	\
+	testdir3/sort/child-does-not-promote-thread/cur/Z	\
+	testdir3/sort/grandchild-promotes-only-subthread/cur/A	\
+	testdir3/sort/grandchild-promotes-only-subthread/cur/B	\
+	testdir3/sort/grandchild-promotes-only-subthread/cur/C	\
+	testdir3/sort/grandchild-promotes-only-subthread/cur/D	\
+	testdir3/sort/grandchild-promotes-only-subthread/cur/E	\
+	testdir3/sort/grandchild-promotes-only-subthread/cur/F	\
+	testdir3/sort/grandchild-promotes-only-subthread/cur/G	\
+	testdir3/sort/grandchild-promotes-thread/cur/A	\
+	testdir3/sort/grandchild-promotes-thread/cur/B	\
+	testdir3/sort/grandchild-promotes-thread/cur/C	\
+	testdir3/sort/grandchild-promotes-thread/cur/D	\
+	testdir3/sort/grandchild-promotes-thread/cur/E	\
 	testdir4/1220863087.12663_19.mindcrime!2,S	\
 	testdir4/1220863042.12663_1.mindcrime!2,S	\
 	testdir4/1283599333.1840_11.cthulhu!2,		\
 	testdir4/1305664394.2171_402.cthulhu!2,		\
 	testdir4/1252168370_3.14675.cthulhu!2,S		\
 	testdir4/mail1					\
-        testdir4/mail5					\
-        testdir4/181736.eml				\
+	testdir4/mail5					\
+	testdir4/181736.eml				\
 	testdir4/encrypted!2,S				\
 	testdir4/multimime!2,FS				\
 	testdir4/signed!2,S				\