Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision b215e92bfedeb7c4e8f461b277d80772d1c37217)
+++ driver/cfa.cc	(revision 8bdc1c3697b2e1de0236800876ece6536192a757)
@@ -416,4 +416,6 @@
 		args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
 		nargs += 1;
+		args[nargs] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
+		nargs += 1;
 		args[nargs] = "-lcfa";
 		nargs += 1;
Index: tests/pybin/settings.py
===================================================================
--- tests/pybin/settings.py	(revision b215e92bfedeb7c4e8f461b277d80772d1c37217)
+++ tests/pybin/settings.py	(revision 8bdc1c3697b2e1de0236800876ece6536192a757)
@@ -112,5 +112,4 @@
 	global install
 	global timeout
-	global ldpath
 
 	dry_run    = options.dry_run
@@ -121,5 +120,4 @@
 	arch       = Architecture(options.arch)
 	timeout    = Timeouts(options.timeout, options.global_timeout)
-	ldpath     = "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH:%s/../libcfa/%s-%s/src/.libs\"" % (BUILDDIR, arch.string, "debug" if options.debug else "nodebug")
 
 
Index: tests/test.py
===================================================================
--- tests/test.py	(revision b215e92bfedeb7c4e8f461b277d80772d1c37217)
+++ tests/test.py	(revision 8bdc1c3697b2e1de0236800876ece6536192a757)
@@ -162,5 +162,5 @@
 		if settings.dry_run or fileIsExecutable(exe_file) :
 			# run test
-			retcode, _ = sh("%s timeout %d %s > %s 2>&1" % (settings.ldpath, settings.timeout.single, exe_file, out_file), input = in_file)
+			retcode, _ = sh("timeout %d %s > %s 2>&1" % (settings.timeout.single, exe_file, out_file), input = in_file)
 		else :
 			# simply cat the result into the output