diff --git a/Makefile.am b/Makefile.am
index 9724cc9..8e6dab5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,7 +103,39 @@ install-exec-hook:
 	perl findstatic.pl */*.o | grep -v Checking ||:
 
 TEST_EXTENSIONS = .sh
+
+EXTRA_DIST += \
+	test/data/5.bspatch.diff \
+	test/data/5.bspatch.original \
+	test/data/6.bspatch.diff \
+	test/data/6.bspatch.original \
+	test/data/7.bspatch.diff \
+	test/data/7.bspatch.original \
+	test/data/8.bspatch.diff \
+	test/data/8.bspatch.original \
+	test/data/9.bspatch.diff \
+	test/data/9.bspatch.modified \
+	test/data/9.bspatch.original \
+	test/data/10.bspatch.diff \
+	test/data/10.bspatch.modified \
+	test/data/10.bspatch.original \
+	test/data/11.bspatch.diff \
+	test/data/12.bspatch.diff \
+	test/data/12.bspatch.modified \
+	test/data/12.bspatch.original \
+	test/data/13.bspatch.modified \
+	test/data/13.bspatch.original \
+	test/data/14.bspatch.modified \
+	test/data/14.bspatch.original \
+	test/data/15.bspatch.modified \
+	test/data/15.bspatch.original \
+	test/data/16.bspatch.diff \
+	test/data/16.bspatch.original
+
 if ENABLE_TESTS
+AM_TESTS_ENVIRONMENT = \
+	abs_builddir=$(abs_builddir); export abs_builddir;
+
 tap_driver = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 	$(top_srcdir)/tap-driver.sh
 
diff --git a/test/run.sh b/test/run.sh
index 1d431f1..ef2b284 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -8,7 +8,7 @@ testnum=0
 
 sudo rm -f *.diff *.out
 
-libdir="$(readlink -f "../.libs")"
+libdir="$abs_builddir/.libs"
 ldpath="LD_LIBRARY_PATH=$libdir"
 BSDIFF="sudo $ldpath valgrind -q $libdir/bsdiff"
 BSPATCH="sudo $ldpath valgrind -q $libdir/bspatch"