diff --git a/src/lib-mail/Makefile.am b/src/lib-mail/Makefile.am
index 44f375dbc0..38b95b9aef 100644
--- a/src/lib-mail/Makefile.am
+++ b/src/lib-mail/Makefile.am
@@ -107,112 +107,106 @@ test_programs = \
 noinst_PROGRAMS = $(test_programs)
 
 test_libs = \
+	$(noinst_LTLIBRARIES) \
 	../lib-test/libtest.la \
 	../lib/liblib.la
 
 test_deps = $(noinst_LTLIBRARIES) $(test_libs)
 
 test_istream_dot_SOURCES = test-istream-dot.c
-test_istream_dot_LDADD = istream-dot.lo $(test_libs)
+test_istream_dot_LDADD = $(test_libs)
 test_istream_dot_DEPENDENCIES = $(test_deps)
 
 test_istream_qp_decoder_SOURCES = test-istream-qp-decoder.c
-test_istream_qp_decoder_LDADD = istream-qp-decoder.lo qp-decoder.lo $(test_libs)
+test_istream_qp_decoder_LDADD = $(test_libs)
 test_istream_qp_decoder_DEPENDENCIES = $(test_deps)
 
-message_parser_objects = \
-	message-parser.lo \
-	message-header-parser.lo \
-	message-size.lo \
-	rfc822-parser.lo \
-	rfc2231-parser.lo
-
 test_istream_binary_converter_SOURCES = test-istream-binary-converter.c
-test_istream_binary_converter_LDADD = istream-binary-converter.lo $(message_parser_objects)  $(test_libs)
+test_istream_binary_converter_LDADD = $(test_libs)
 test_istream_binary_converter_DEPENDENCIES = $(test_deps)
 
 test_istream_attachment_SOURCES = test-istream-attachment.c
-test_istream_attachment_LDADD = istream-attachment-extractor.lo istream-attachment-connector.lo $(message_parser_objects) $(test_libs)
+test_istream_attachment_LDADD = $(test_libs)
 test_istream_attachment_DEPENDENCIES = $(test_deps)
 
 test_istream_header_filter_SOURCES = test-istream-header-filter.c
-test_istream_header_filter_LDADD = istream-header-filter.lo message-header-parser.lo $(test_libs)
+test_istream_header_filter_LDADD = $(test_libs)
 test_istream_header_filter_DEPENDENCIES = $(test_deps)
 
 test_mbox_from_SOURCES = test-mbox-from.c
-test_mbox_from_LDADD = mbox-from.lo $(test_libs)
+test_mbox_from_LDADD = $(test_libs)
 test_mbox_from_DEPENDENCIES = $(test_deps)
 
 test_message_address_SOURCES = test-message-address.c
-test_message_address_LDADD = message-address.lo rfc822-parser.lo $(test_libs)
+test_message_address_LDADD = $(test_libs)
 test_message_address_DEPENDENCIES = $(test_deps)
 
 test_message_date_SOURCES = test-message-date.c
-test_message_date_LDADD = message-date.lo rfc822-parser.lo $(test_libs)
+test_message_date_LDADD = $(test_libs)
 test_message_date_DEPENDENCIES = $(test_deps)
 
 test_message_decoder_SOURCES = test-message-decoder.c
-test_message_decoder_LDADD = message-decoder.lo qp-decoder.lo quoted-printable.lo rfc822-parser.lo rfc2231-parser.lo ../lib-charset/libcharset.la $(test_libs)
-test_message_decoder_DEPENDENCIES = ../lib-charset/libcharset.la $(test_deps)
+test_message_decoder_LDADD = $(test_libs) ../lib-charset/libcharset.la
+test_message_decoder_DEPENDENCIES = $(test_deps) ../lib-charset/libcharset.la
 
 test_message_header_decode_SOURCES = test-message-header-decode.c
-test_message_header_decode_LDADD = message-header-decode.lo quoted-printable.lo message-header-encode.lo $(test_libs)
+test_message_header_decode_LDADD = $(test_libs)
 test_message_header_decode_DEPENDENCIES = $(test_deps)
 
 test_message_header_encode_SOURCES = test-message-header-encode.c
-test_message_header_encode_LDADD = message-header-encode.lo $(test_libs)
+test_message_header_encode_LDADD = $(test_libs)
 test_message_header_encode_DEPENDENCIES = $(test_deps)
 
 test_message_header_hash_SOURCES = test-message-header-hash.c
-test_message_header_hash_LDADD = message-header-hash.lo $(test_libs)
+test_message_header_hash_LDADD = $(test_libs)
 test_message_header_hash_DEPENDENCIES = $(test_deps)
 
 test_message_header_parser_SOURCES = test-message-header-parser.c
-test_message_header_parser_LDADD = message-header-parser.lo $(test_libs)
+test_message_header_parser_LDADD = $(test_libs)
 test_message_header_parser_DEPENDENCIES = $(test_deps)
 
 test_message_id_SOURCES = test-message-id.c
-test_message_id_LDADD = message-id.lo rfc822-parser.lo $(test_libs)
+test_message_id_LDADD = $(test_libs)
 test_message_id_DEPENDENCIES = $(test_deps)
 
 test_message_parser_SOURCES = test-message-parser.c
-test_message_parser_LDADD = message-parser.lo message-header-parser.lo message-size.lo rfc822-parser.lo rfc2231-parser.lo $(test_libs)
+test_message_parser_LDADD = $(test_libs)
 test_message_parser_DEPENDENCIES = $(test_deps)
 
 test_message_part_SOURCES = test-message-part.c
-test_message_part_LDADD = message-part.lo message-parser.lo message-header-parser.lo message-size.lo rfc822-parser.lo rfc2231-parser.lo $(test_libs)
+test_message_part_LDADD = $(test_libs)
 test_message_part_DEPENDENCIES = $(test_deps)
 
 test_message_search_SOURCES = test-message-search.c
-test_message_search_LDADD = libmail.la ../lib-charset/libcharset.la $(test_libs)
-test_message_search_DEPENDENCIES = $(test_deps)
+test_message_search_LDADD = $(test_libs) ../lib-charset/libcharset.la
+test_message_search_DEPENDENCIES = $(test_deps) ../lib-charset/libcharset.la
 
 test_message_snippet_SOURCES = test-message-snippet.c
-test_message_snippet_LDADD = message-snippet.lo mail-html2text.lo $(test_message_decoder_LDADD) message-parser.lo message-header-parser.lo message-header-decode.lo message-size.lo
+test_message_snippet_LDADD = $(test_message_decoder_LDADD)
 test_message_snippet_DEPENDENCIES = $(test_deps)
 
 test_mail_html2text_SOURCES = test-mail-html2text.c
-test_mail_html2text_LDADD = mail-html2text.lo $(test_libs)
+test_mail_html2text_LDADD = $(test_libs)
 test_mail_html2text_DEPENDENCIES = $(test_deps)
 
 test_ostream_dot_SOURCES = test-ostream-dot.c
-test_ostream_dot_LDADD = ostream-dot.lo $(test_libs)
+test_ostream_dot_LDADD = $(test_libs)
 test_ostream_dot_DEPENDENCIES = $(test_deps)
 
 test_qp_decoder_SOURCES = test-qp-decoder.c
-test_qp_decoder_LDADD = qp-decoder.lo $(test_libs)
+test_qp_decoder_LDADD = $(test_libs)
 test_qp_decoder_DEPENDENCIES = $(test_deps)
 
 test_quoted_printable_SOURCES = test-quoted-printable.c
-test_quoted_printable_LDADD = quoted-printable.lo $(test_libs)
+test_quoted_printable_LDADD = $(test_libs)
 test_quoted_printable_DEPENDENCIES = $(test_deps)
 
 test_rfc2231_parser_SOURCES = test-rfc2231-parser.c
-test_rfc2231_parser_LDADD = rfc2231-parser.lo rfc822-parser.lo $(test_libs)
+test_rfc2231_parser_LDADD = $(test_libs)
 test_rfc2231_parser_DEPENDENCIES = $(test_deps)
 
 test_rfc822_parser_SOURCES = test-rfc822-parser.c
-test_rfc822_parser_LDADD = rfc822-parser.lo $(test_libs)
+test_rfc822_parser_LDADD = $(test_libs)
 test_rfc822_parser_DEPENDENCIES = $(test_deps)
 
 check: check-am check-test