diff --git a/ChangeLog b/ChangeLog
index a6472798..ae379069 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Fix srcdir computation for manual runs of old tests.
+	* tests/defs.m4sh: Strip trailing `/tests' from srcdir, to allow
+	`$srcdir/tests/FOO.test' to be run from the top build directory.
+
 	Clean up @var handling in the manual.
 	* doc/libtool.texi: Throughout the manual, replace @var with
 	@samp or @code as appropriate, ensure the argument of remaining
diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 58296da0..12305555 100644
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -2,7 +2,7 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # @configure_input@
 # defs -- Defines for Libtool testing environment.
 #
-#   Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software
+#   Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free Software
 #   Foundation, Inc.
 #   Written by Gord Matzigkeit, 1996
 #   Rewritten by Gary V. Vaughan, 2003
@@ -59,7 +59,7 @@ DEBUG | debug )
 esac
 
 if test -z "$srcdir"; then
-  srcdir=`$ECHO "$0" | $SED "$dirname"`
+  srcdir=`$ECHO "$0" | $SED "$dirname; s,/tests\$,,"`
   test "$srcdir" = "$0" && srcdir=.
 fi