diff --git a/analyses/Makefile.am b/analyses/Makefile.am
--- a/analyses/Makefile.am
+++ b/analyses/Makefile.am
@@ -1,51 +1,51 @@
 AUTOMAKE_OPTIONS = -Wno-portability
 
 if ENABLE_ANALYSES
 
 PLUGIN_DIRS = $(shell ls -d $(srcdir)/plugin*)
 PLUGIN_NAMES = $(notdir $(subst plugin,,$(PLUGIN_DIRS)))
 PLUGIN_LIBS = $(patsubst %,Rivet%Analyses.so,$(PLUGIN_NAMES))
-PLUGIN_DATAFILES = $(shell ls $(srcdir)/plugin*/*.{info,plot,yoda})
+PLUGIN_DATAFILES = $(shell ls $(abs_srcdir)/plugin*/*.{info,plot,yoda})
 
 CLEANFILES = $(PLUGIN_LIBS)
 EXTRA_DIST = $(PLUGIN_DIRS)
 
 %.so:
 	@+echo && RIVET_BUILDPLUGIN_BEFORE_INSTALL=1 bash $(top_builddir)/bin/rivet-buildplugin -j2 $@ $^ -I$(top_builddir)/include
 
 RivetALICEAnalyses.so: $(shell ls $(srcdir)/pluginALICE/*.cc)
 RivetATLASAnalyses.so: $(shell ls $(srcdir)/pluginATLAS/*.cc)
 RivetCDFAnalyses.so  : $(shell ls $(srcdir)/pluginCDF/*.cc)
 RivetCMSAnalyses.so  : $(shell ls $(srcdir)/pluginCMS/*.cc)
 RivetD0Analyses.so   : $(shell ls $(srcdir)/pluginD0/*.cc)
 RivetHERAAnalyses.so : $(shell ls $(srcdir)/pluginHERA/*.cc)
 RivetLEPAnalyses.so  : $(shell ls $(srcdir)/pluginLEP/*.cc)
 RivetLHCbAnalyses.so : $(shell ls $(srcdir)/pluginLHCb/*.cc)
 ## RivetLHCfAnalyses.so : $(shell ls $(srcdir)/pluginLHCf/*.cc)
 RivetMCAnalyses.so   : $(shell ls $(srcdir)/pluginMC/*.cc)
 RivetMiscAnalyses.so : $(shell ls $(srcdir)/pluginMisc/*.cc)
 RivetPetraAnalyses.so: $(shell ls $(srcdir)/pluginPetra/*.cc)
 RivetRHICAnalyses.so : $(shell ls $(srcdir)/pluginRHIC/*.cc)
 RivetSPSAnalyses.so  : $(shell ls $(srcdir)/pluginSPS/*.cc)
 RivetTOTEMAnalyses.so: $(shell ls $(srcdir)/pluginTOTEM/*.cc)
 
 all-local: $(PLUGIN_LIBS) $(PLUGIN_DATAFILES)
 	mkdir -p $(builddir)/data
-	@for i in $(PLUGIN_DATAFILES); do $(LN_S) -f $$i $(builddir)/data; done
+	$(LN_S) -f $(abs_srcdir)/plugin*/*.{info,plot,yoda} $(builddir)/data
 
 clean-local:
 	rm -rf data
 
 install-exec-local: $(PLUGIN_LIBS)
 	$(INSTALL) $^ $(DESTDIR)$(libdir)
 
 install-data-local: $(PLUGIN_DATAFILES)
 	@echo "Installing analysis data files..."
 	@$(install_sh_DATA) $^ $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	cd $(DESTDIR)$(libdir) && rm -f $(PLUGIN_LIBS)
 	@echo "Uninstalling analysis data files..."
 	rm -f $(DESTDIR)$(pkgdatadir)/*.{info,plot,yoda}
 
 endif
diff --git a/test/Makefile.am b/test/Makefile.am
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,46 +1,46 @@
 check_PROGRAMS = testMath testMatVec testCmp testApi testNaN testBeams
 
 AM_LDFLAGS = -L$(top_srcdir)/src $(YAMLCPP_LDFLAGS) -L$(YODALIBPATH)
 LIBS = -lm $(GSL_LDFLAGS) -lYODA
 
 TEST_LDADD = $(top_builddir)/src/libRivet.la $(HEPMCLDFLAGS) $(YODALDFLAGS) $(HEPMCLDLIBS) $(YODALDLIBS)
 
 testMath_SOURCES = testMath.cc
 testMath_LDADD = $(TEST_LDADD)
 testMatVec_SOURCES = testMatVec.cc
 testMatVec_LDADD = $(TEST_LDADD)
 testCmp_SOURCES = testCmp.cc
 testCmp_LDADD = $(TEST_LDADD)
 testApi_SOURCES = testApi.cc
 testApi_LDADD = $(TEST_LDADD)
 testNaN_SOURCES = testNaN.cc
 testNaN_LDADD = $(TEST_LDADD)
 testBeams_SOURCES = testBeams.cc
 testBeams_LDADD = $(TEST_LDADD)
 
 TESTS_ENVIRONMENT = \
   RIVET_ANALYSIS_PATH=$(top_builddir)/analyses \
-  RIVET_DATA_PATH=$(top_srcdir)/analyses/data \
-  RIVET_INFO_PATH=$(top_srcdir)/analyses/data \
-  RIVET_REF_PATH=$(top_srcdir)/analyses/data \
+  RIVET_DATA_PATH=$(top_builddir)/analyses/data \
+  RIVET_INFO_PATH=$(top_builddir)/analyses/data \
+  RIVET_REF_PATH=$(top_builddir)/analyses/data \
   LIBLOCATION=$(top_builddir)/src/.libs:$(HEPMCLIBPATH):$(YODALIBPATH):$(FASTJETLIBPATH) \
   LD_LIBRARY_PATH=$$LIBLOCATION:$(LD_LIBRARY_PATH) \
   DYLD_LIBRARY_PATH=$$LIBLOCATION:$(DYLD_LIBRARY_PATH) \
   PYTHONPATH=$(top_builddir)/pyext/build/$(RIVET_SETUP_PY_PATH):$(PYTHONPATH) \
   PATH=$(top_builddir)/bin:$(top_srcdir)/bin:$(PATH) \
   PYTHON=$(PYTHON) \
   RIVET_TESTS_SRC=$(srcdir)
 
 TESTS = \
 testMath testMatVec testCmp testApi testNaN testBeams \
 testImport.sh
 
 if ENABLE_ANALYSES
 if ! WITH_OSX
 TESTS += testCmdLine.sh
 endif
 endif
 
 EXTRA_DIST = testApi.hepmc testCmdLine.sh testImport.sh
 
 CLEANFILES = log a.out fifo.hepmc file2.hepmc out.yoda NaN.aida Rivet.yoda
diff --git a/test/testCmdLine.sh b/test/testCmdLine.sh
--- a/test/testCmdLine.sh
+++ b/test/testCmdLine.sh
@@ -1,61 +1,61 @@
 #! /usr/bin/env bash
 
 #set -x
 
-export LD_LIBRARY_PATH=$LIBLOCATION
-export DYLD_LIBRARY_PATH=$LIBLOCATION
+export LD_LIBRARY_PATH=$LIBLOCATION:$LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH=$LIBLOCATION:$DYLD_LIBRARY_PATH
 
 echo PYTHONPATH=$PYTHONPATH
 echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 echo PATH=$PATH
 echo
 echo RIVET_ANALYSIS_PATH=$RIVET_ANALYSIS_PATH
 echo RIVET_DATA_PATH=$RIVET_DATA_PATH
 echo RIVET_REF_PATH=$RIVET_REF_PATH
 echo RIVET_INFO_PATH=$RIVET_INFO_PATH
 echo
 echo PYTHON=$PYTHON
 
 function _clean() {
     rm -f fifo.hepmc
     rm -f file2.hepmc
 }
 
 function _setup() {
     _clean
     cp ${RIVET_TESTS_SRC}/testApi.hepmc file2.hepmc
     mkfifo fifo.hepmc
 }
 
 function _check() {
     CODE=$?
     if [[ $CODE -ne 0 ]]; then
         _clean
         _exit $CODE
     fi
 }
 echo "trying to load rivet python module"
 $PYTHON -c 'import rivet'  || exit $?
 echo "Success"
 
 _setup
 
 echo
 rivet --list-analyses > log || exit $?
 
 echo
 rivet -a D0_2008_S7554427 ${RIVET_TESTS_SRC}/testApi.hepmc file2.hepmc > log || exit $?
 grep -q "20 events" log
 _check
 
 echo
 cat ${RIVET_TESTS_SRC}/testApi.hepmc | rivet -a D0_2008_S7554427 > log || exit $?
 grep -q "10 events" log
 _check
 
 echo
 cat ${RIVET_TESTS_SRC}/testApi.hepmc > fifo.hepmc &
 rivet -a D0_2008_S7554427 fifo.hepmc > log || exit $?
 grep -q "10 events" log
 _check
 _clean
diff --git a/test/testImport.sh b/test/testImport.sh
--- a/test/testImport.sh
+++ b/test/testImport.sh
@@ -1,22 +1,22 @@
 #! /usr/bin/env bash
 
 #set -x
 
-export LD_LIBRARY_PATH=$LIBLOCATION
-export DYLD_LIBRARY_PATH=$LIBLOCATION
+export LD_LIBRARY_PATH=$LIBLOCATION:$LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH=$LIBLOCATION:$DYLD_LIBRARY_PATH
 
 echo PYTHONPATH=$PYTHONPATH
 echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 echo PATH=$PATH
 echo
 echo RIVET_ANALYSIS_PATH=$RIVET_ANALYSIS_PATH
 echo RIVET_DATA_PATH=$RIVET_DATA_PATH
 echo RIVET_REF_PATH=$RIVET_REF_PATH
 echo RIVET_INFO_PATH=$RIVET_INFO_PATH
 echo
 echo PYTHON=$PYTHON
 
 
 echo "trying to load rivet python module"
 $PYTHON -c 'import rivet'  || exit $?
 echo "Success"