diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index bab9dd9a..6d995391 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -68,10 +68,18 @@ BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 AM_LDFLAGS = -no-install
 LDADD = ../../src/libgpgme.la @LDADD_FOR_TESTS_KLUDGE@
-t_thread1_LDADD = ../../src/libgpgme.la -lpthread @LDADD_FOR_TESTS_KLUDGE@
-t_thread_keylist_LDADD = ../../src/libgpgme.la -lpthread @LDADD_FOR_TESTS_KLUDGE@
-t_thread_keylist_verify_LDADD = ../../src/libgpgme.la -lpthread @LDADD_FOR_TESTS_KLUDGE@
-t_cancel_LDADD = ../../src/libgpgme.la -lpthread @LDADD_FOR_TESTS_KLUDGE@
+
+WITH_THREAD_CPPFLAGS =  -I$(top_builddir)/src @GPG_ERROR_MT_CFLAGS@
+WITH_THREAD_LDADD = ../../src/libgpgme.la \
+	@GPG_ERROR_MT_LIBS@ @LDADD_FOR_TESTS_KLUDGE@
+t_thread1_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
+t_thread1_LDADD = $(WITH_THREAD_LDADD)
+t_thread_keylist_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
+t_thread_keylist_LDADD = $(WITH_THREAD_LDADD)
+t_thread_keylist_verify_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
+t_thread_keylist_verify_LDADD = $(WITH_THREAD_LDADD)
+t_cancel_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
+t_cancel_LDADD = $(WITH_THREAD_LDADD)
 
 # We don't run t-genkey and t-cancel in the test suite, because it
 # takes too long