3 files changed, 10 insertions, 6 deletions
diff --git a/tests/internals/Makefile.am b/tests/internals/Makefile.am
index 3006399..c35d9be 100644
--- a/tests/internals/Makefile.am
+++ b/tests/internals/Makefile.am
@@ -1,14 +1,14 @@
 
 noinst_HEADERS = test_common.h
 noinst_PROGRAMS = test_internals test_rate_limiter
-test_internals_SOURCES = test_internals.c test_common.c $(top_builddir)/src/misc.c
-test_rate_limiter_SOURCES = test_rate_limiter.c test_common.c $(top_builddir)/src/rate_limiter.c
+test_internals_SOURCES = test_internals.c test_common.c $(top_srcdir)/src/misc.c
+test_rate_limiter_SOURCES = test_rate_limiter.c test_common.c $(top_srcdir)/src/rate_limiter.c
 
-test_internals_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I. -I$(top_builddir)/src
+test_internals_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I. -I$(top_srcdir)/src
 test_internals_CFLAGS = ${my_CFLAGS}
 test_internals_LDADD = ${my_LDFLAGS}
 
-test_rate_limiter_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I. -I$(top_builddir)/src
+test_rate_limiter_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I. -I$(top_srcdir)/src
 test_rate_limiter_CFLAGS = ${my_CFLAGS}
 test_rate_limiter_LDADD = ${my_LDFLAGS}
 
diff --git a/tests/internals/test_internals_valgrind.sh b/tests/internals/test_internals_valgrind.sh
index a84c664..4511ccd 100755
--- a/tests/internals/test_internals_valgrind.sh
+++ b/tests/internals/test_internals_valgrind.sh
@@ -1,3 +1,5 @@
 #!/bin/sh
-cd `dirname "$0"`
+if [ ! -x ./test_internals ]; then
+    cd `dirname "$0"`
+fi
 valgrind --error-exitcode=100 ./test_internals
diff --git a/tests/internals/test_rate_limiter_valgrind.sh b/tests/internals/test_rate_limiter_valgrind.sh
index e291360..bf0a7cd 100755
--- a/tests/internals/test_rate_limiter_valgrind.sh
+++ b/tests/internals/test_rate_limiter_valgrind.sh
@@ -1,3 +1,5 @@
 #!/bin/sh
-cd `dirname "$0"`
+if [ ! -x ./test_rate_limiter ]; then
+    cd `dirname "$0"`
+fi
 valgrind --error-exitcode=100 ./test_rate_limiter