diff --git a/tests/ChangeLog b/tests/ChangeLog
index 53b9c516..ba4b28e6 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-22  Marcus Brinkmann  <marcus@g10code.de>
+
+	* Makefile.am (TEST_ENVIRONMENT): Set environment to $(srcdir),
+	not current directory.
+
 2001-10-22  Marcus Brinkmann  <marcus@g10code.de>
 
 	* t-data.c (write_test): New function.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6b6d4956..7a2c2d86 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,7 +20,7 @@
 ## Process this file with automake to produce Makefile.in
 
 
-TESTS_ENVIRONMENT = GNUPGHOME=. 
+TESTS_ENVIRONMENT = GNUPGHOME=$(srcdir)
 
 TESTS = t-version t-data t-encrypt t-sign t-decrypt t-verify t-keylist	\
 	t-export t-import t-trustlist