diff --git a/guile/tests/Makefile.am b/guile/tests/Makefile.am
index e374d85d..f1e350f9 100644
--- a/guile/tests/Makefile.am
+++ b/guile/tests/Makefile.am
@@ -27,6 +27,7 @@ INCLUDES=$(XAPIAN_CXXFLAGS)					\
 	-DMU_TESTMAILDIR3=\"${top_srcdir}/lib/tests/testdir3\"	\
 	-DMU_PROGRAM=\"${abs_top_builddir}/mu/mu\"		\
 	-DMU_GUILE_MODULE_PATH=\"${top_srcdir}/guile/mu\"       \
+	-DMU_GUILE_LIBRARY_PATH=\"${abs_top_builddir}/guile/.libs\" \
 	-DABS_CURDIR=\"${abs_builddir}\"			\
 	-DABS_SRCDIR=\"${abs_srcdir}\"
 
@@ -47,3 +48,5 @@ BUILT_SOURCES=					\
 	dummy.cc
 dummy.cc:
 	touch dummy.cc
+
+EXTRA_DIST=test-mu-guile.scm
diff --git a/guile/tests/test-mu-guile.c b/guile/tests/test-mu-guile.c
index 17036bf8..7d2a6d4c 100644
--- a/guile/tests/test-mu-guile.c
+++ b/guile/tests/test-mu-guile.c
@@ -66,12 +66,14 @@ fill_database (void)
 static void
 test_something (const char *what)
 {
-	char *dir, *cmdline, *output, *erroutput;
+	char *dir, *cmdline;
 	gint result;
 
 	dir = fill_database ();
 	cmdline = g_strdup_printf (
-		"%s -q -L %s -e main %s/test-mu-guile.scm --muhome=%s --test=%s",
+		"LD_LIBRARY_PATH=%s %s -q -L %s -e main %s/test-mu-guile.scm "
+		"--muhome=%s --test=%s",
+		MU_GUILE_LIBRARY_PATH,
 		GUILE_BINARY,
 		MU_GUILE_MODULE_PATH,
 		ABS_SRCDIR,
@@ -81,21 +83,9 @@ test_something (const char *what)
 	if (g_test_verbose ())
 		g_print ("cmdline: %s\n", cmdline);
 
-	output = erroutput = NULL;
-	g_assert (g_spawn_command_line_sync (cmdline,
-					     &output, &erroutput,
-					     &result, NULL));
+	result = system (cmdline);
 	g_assert (result == 0);
 
-	if (g_test_verbose ()) {
-		if (output)
-			g_print ("stdout: %s\n", output);
-		if (erroutput)
-			g_print ("stderr: %s\n", erroutput);
-	}
-
-	g_free (output);
-	g_free (erroutput);
 	g_free (dir);
 	g_free (cmdline);
 }