diff --git a/ChangeLog b/ChangeLog
index 1e12a52e1..42f2ce36f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-11-28  Alexandre Duret-Lutz  <adl@src.lip6.fr>
 
+	* wrap/python/tests/run.in: Define DYLD_LIBRARY_PATH so that
+	Darwin finds non-installed libraries.
+	Report from Akim Demaille.
+
 	* src/tgbatest/ltl2tgba.cc (syntax): Mention gv04 in help text.
 
 2004-11-27  Alexandre Duret-Lutz  <adl@src.lip6.fr>
diff --git a/wrap/python/tests/run.in b/wrap/python/tests/run.in
index 15a19ea34..9e3970efc 100644
--- a/wrap/python/tests/run.in
+++ b/wrap/python/tests/run.in
@@ -25,13 +25,19 @@
 # unset, be quiet.
 test -n "$srcdir" && test -z "$VERBOSE" && exec >/dev/null 2>&1
 
-test -z "$1" && PYTHONPATH=..:@srcdir@/.. exec @PYTHON@
+# Darwin needs some help in figuring out where non-installed libtool
+# libraries are (on this platform libtool encodes the expected final
+# path of dependent libraries in each library).
+modpath='../.libs:@top_builddir@/src/.libs:@top_builddir@/buddy/src/.libs'
+
+test -z "$1" &&
+  PYTHONPATH='..:@srcdir@/..' DYLD_LIBRARY_PATH=$modpath exec @PYTHON@
 
 case $1 in
   *.py)
-    PYTHONPATH=..:@srcdir@/.. exec @PYTHON@ "$@";;
+    PYTHONPATH='..:@srcdir@/..' DYLD_LIBRARY_PATH=$modpath exec @PYTHON@ "$@";;
   *.test)
-    sh -x "$@";;
+    exec sh -x "$@";;
   *)
     echo "Unknown extension" >&2
     exit 2;;