diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c
index 2ee693e8..383c348f 100644
--- a/lasso/id-ff/provider.c
+++ b/lasso/id-ff/provider.c
@@ -723,7 +723,7 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *path)
 	if (doc == NULL)
 		return FALSE;
 	ret = lasso_provider_load_metadata_from_doc(provider, doc);
-	if (ret == 0) {
+	if (ret == TRUE) {
 		lasso_assign_string(provider->metadata_filename, path);
 	}
 	lasso_release_doc(doc);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d2461ca8..c2785a49 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,11 +18,11 @@ tests_LDADD = \
 	$(top_builddir)/lasso/liblasso.la \
 	$(LASSO_LIBS) \
 	$(CHECK_LIBS)
-tests_LDFLAGS = -rpath $(top_srcdir)/lasso/.libs/
+tests_LDFLAGS = -rpath `cd $(top_srcdir)/lasso/.libs/; pwd`
 
 perfs_SOURCES = perfs.c
 perfs_LDADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
-perfs_LDFLAGS = -rpath $(top_srcdir)/lasso/.libs/
+perfs_LDFLAGS = -rpath `cd $(top_srcdir)/lasso/.libs/; pwd`
 
 endif