diff --git a/tests/ChangeLog b/tests/ChangeLog
index 335560ed..2313453d 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,12 @@
+2003-07-22  Marcus Brinkmann  <marcus@g10code.de>
+
+	* Makefile.am (AM_CPPFLAGS): New variable.
+	(LDADD): Add @GPG_ERROR_LIBS@.
+	* gpg/Makefile.am (AM_CPPFLAGS): New variable.
+	(LDADD): Add @GPG_ERROR_LIBS@.
+	* gpgsm/Makefile.am (AM_CPPFLAGS): New variable.
+	(LDADD): Add @GPG_ERROR_LIBS@.
+
 2003-06-06  Marcus Brinkmann  <marcus@g10code.de>
 
 	Everywhere: Use libgpg-error error codes.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index aa1da798..d8b8f858 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,7 +27,8 @@ EXTRA_DIST = t-data-1.txt t-data-2.txt
 
 INCLUDES = -I$(top_srcdir)/gpgme
 
-LDADD = ../gpgme/libgpgme.la
+AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+LDADD = ../gpgme/libgpgme.la @GPG_ERROR_LIBS@
 
 noinst_PROGRAMS = $(TESTS)
 
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 319f0d1a..57f48526 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -38,7 +38,8 @@ EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
 
 INCLUDES = -I$(top_srcdir)/gpgme
 
-LDADD = ../../gpgme/libgpgme.la
+AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+LDADD = ../../gpgme/libgpgme.la @GPG_ERROR_LIBS@
 
 # We don't run t-genkey in the test suite, because it takes too long
 noinst_PROGRAMS = $(TESTS) t-genkey
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index fa132346..7b76bfba 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -31,7 +31,8 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn_pca15.der cert_g10code_test1.der \
 
 INCLUDES = -I$(top_srcdir)/gpgme
 
-LDADD = ../../gpgme/libgpgme.la
+AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+LDADD = ../../gpgme/libgpgme.la @GPG_ERROR_LIBS@
 
 # We don't run t-genkey in the test suite, because it takes too long
 # and needs a working pinentry.