diff --git a/tests/ChangeLog b/tests/ChangeLog
index 749220d9a..f75387757 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-07  Marcus Brinkmann  <marcus@g10code.de>
+
+	* Makefile.am (TESTS_ENVIRONMENT): Remove LD_LIBRARY_PATH hack.
+	It's the responsibility of the person building the software to set
+	it properly.
+
 2004-09-30  Werner Koch  <wk@g10code.com>
 
 	* Makefile.am (SUBDIRS): Remove pkits until the copyright issues
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bc2e50e10..5264b8859 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,26 +33,7 @@ GPGSM = ../sm/gpgsm
 
 
 TESTS_ENVIRONMENT = GNUPGHOME=`pwd` GPG_AGENT_INFO= LC_ALL=C GPGSM=$(GPGSM) \
-		    LD_LIBRARY_PATH=$$(seen=0; \
-                           for i in $(LDFLAGS) $(LIBGCRYPT_LIBS) $(PTH_LIBS); \
-                           do \
-                             if echo "$$i" | egrep '^-L' >/dev/null 2>&1; \
-                             then \
-                               if test $$seen = 0; \
-                               then \
-                                 seen=1; \
-                               else \
-                                 printf ":"; \
-                               fi; \
-                               printf "%s" "$${i}" | sed 's/^-L//'; \
-                             fi; \
-                           done; \
-                           if test $$seen != 0 \
-                              && test x$${LD_LIBRARY_PATH} != x; \
-                           then \
-                             printf ":"; \
-                           fi; \
-                           printf "%s" "$${LD_LIBRARY_PATH}") $(srcdir)/runtest
+	$(srcdir)/runtest
 
 testscripts = sm-sign+verify sm-verify