diff --git a/ChangeLog b/ChangeLog
index 2ad989a0..be05893a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-04-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* tests/cmdline_wrap.at: Avoid `AT_CAPTURE_FILE' if it not
+	defined (Autoconf < 2.60).
+	* tests/shlibpath.at: Add `libtool' keyword.
+
 	* tests/indirect_deps.at: New file, with tests to ensure
 	`link_all_deplibs=no' does not break functionality.
 	* Makefile.am: Adjust.
@@ -101,7 +105,7 @@
 	libltdl/ltdl.h, libltdl/m4/argz.m4, libltdl/m4/libtool.m4,
 	libltdl/m4/ltdl.m4, libltdl/m4/ltoptions.m4,
 	libltdl/m4/ltsugar.m4, libltdl/m4/ltversion.in,
-	Jlibltdl/m4/ltversion.m4, libltdl/m4/lt~obsolete.m4,
+	libltdl/m4/ltversion.m4, libltdl/m4/lt~obsolete.m4,
 	libltdl/slist.c, libtoolize.m4sh, tests/am-subdir.at,
 	tests/cdemo-conf.test, tests/cdemo-exec.test,
 	tests/cdemo-make.test, tests/cdemo-shared.test,
diff --git a/tests/cmdline_wrap.at b/tests/cmdline_wrap.at
index 8c84a691..0c47db81 100644
--- a/tests/cmdline_wrap.at
+++ b/tests/cmdline_wrap.at
@@ -27,7 +27,8 @@
 
 AT_SETUP([Run tests with low max_cmd_len])
 AT_KEYWORDS([recursive])
-AT_CAPTURE_FILE([testsuite.log])
+m4_ifdef([AT_CAPTURE_FILE],
+[AT_CAPTURE_FILE([testsuite.log])])
 
 sed 's,max_cmd_len=.*,max_cmd_len="24",' < $LIBTOOL > libtool
 chmod +x libtool
diff --git a/tests/shlibpath.at b/tests/shlibpath.at
index 9087ec54..8656bade 100644
--- a/tests/shlibpath.at
+++ b/tests/shlibpath.at
@@ -23,6 +23,7 @@
 ####
 
 AT_SETUP([shlibpath_overrides_runpath])
+AT_KEYWORDS([libtool])
 
 mkdir sub sub/lib sub/bin
 echo 'int a () { return 0; }' > a.c