diff --git a/doc/org/.dir-locals.el.in b/doc/org/.dir-locals.el.in
index 05ac61844..ca511e3d0 100644
--- a/doc/org/.dir-locals.el.in
+++ b/doc/org/.dir-locals.el.in
@@ -15,6 +15,7 @@
 				      "@abs_top_srcdir@/python:"
 				      "@abs_top_builddir@/python/spot/.libs:"
 				      "@abs_top_builddir@/python/spot:"
+				      "@abs_top_builddir@/spot/ltsmin/.libs"
 				      "@abs_top_srcdir@/python/spot:"
 				      (getenv "PYTHONPATH")))
 		      (setenv "DYLD_LIBRARY_PATH"
diff --git a/doc/org/init.el.in b/doc/org/init.el.in
index cfacff63e..467b4d0a3 100644
--- a/doc/org/init.el.in
+++ b/doc/org/init.el.in
@@ -38,6 +38,7 @@
 		"@abs_top_srcdir@/python:"
 		"@abs_top_builddir@/python/spot/.libs:"
 		"@abs_top_builddir@/python/spot:"
+		"@abs_top_builddir@/spot/ltsmin/.libs"
 		"@abs_top_srcdir@/python/spot:"
 		(getenv "PYTHONPATH")))
 (setenv "DYLD_LIBRARY_PATH"
diff --git a/python/ajax/spotcgi.in b/python/ajax/spotcgi.in
index 5145a14df..0d950f506 100755
--- a/python/ajax/spotcgi.in
+++ b/python/ajax/spotcgi.in
@@ -195,15 +195,10 @@ if ('SERVER_SOFTWARE' in os.environ and
     # Add the build and source directories first in the search path.
     # If we are not in the right place, python will find the installed
     # libraries later.
-    sys.path.insert(0, '@srcdir@/../.libs')
     sys.path.insert(0, '@srcdir@/..')
     sys.path.insert(0, '../.libs')
+    sys.path.insert(0, '../spot/.libs')
     sys.path.insert(0, '..')
-    # 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).
-    m = '../.libs:@top_builddir@/spot/.libs:@top_builddir@/buddy/src/.libs'
-    os.environ['DYLD_LIBRARY_PATH'] = m
 
 try:
     # execfile('ltl2tgba.opt') no longuer work with Python 3.
diff --git a/tests/run.in b/tests/run.in
index 2b005ec73..8aedf320e 100755
--- a/tests/run.in
+++ b/tests/run.in
@@ -25,7 +25,9 @@
 # libraries are (on this platform libtool encodes the expected final
 # path of dependent libraries in each library).
 modpath='@abs_top_builddir@/python/.libs:@abs_top_builddir@/python/spot/.libs'
-modpath=$modpath:'@top_builddir@/spot/.libs:@top_builddir@/buddy/src/.libs'
+modpath=$modpath:'@abs_top_builddir@/spot/ltsmin/.libs'
+modpath=$modpath:'@abs_top_builddir@/spot/.libs'
+modpath=$modpath:'@abs_top_builddir@/buddy/src/.libs'
 
 # We need access to both the *.py files, and the *.so.  We used to
 # rely on a module called ltihooks.py to teach the import function how