4 files changed, 12 insertions, 6 deletions
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 85e1f392..fbf74d8b 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-include $(top_srcdir)/subdir-rules.mk
-
 # Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= $(top_builddir)/tests/data
+builddir ?= .
+
+include $(top_srcdir)/subdir-rules.mk
 
 EXTRA_DIST = \
 	filesanddirs-10M.tar.xz \
diff --git a/tests/extra/Makefile.am b/tests/extra/Makefile.am
index 911c83eb..9bcb9881 100644
--- a/tests/extra/Makefile.am
+++ b/tests/extra/Makefile.am
@@ -48,6 +48,9 @@
 #   - hard to test because guestmount forks into the background, and
 #     if valgrind reports errors it doesn't stop the test shell script
 
+# Old RHEL 5 autoconf doesn't have abs_srcdir.
+abs_srcdir ?= $(shell cd $(top_srcdir)/tests/extra && pwd)
+
 EXTRA_DIST = pick-guests.pl suppressions
 
 VG = $(VALGRIND) \
diff --git a/tests/guests/Makefile.am b/tests/guests/Makefile.am
index e20d91ca..3e5aea03 100644
--- a/tests/guests/Makefile.am
+++ b/tests/guests/Makefile.am
@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-include $(top_srcdir)/subdir-rules.mk
-
 # Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= $(top_builddir)/tests/guests
+builddir ?= .
+
+include $(top_srcdir)/subdir-rules.mk
 
 EXTRA_DIST = \
 	guest-aux/make-debian-img.sh \
diff --git a/tests/xml/Makefile.am b/tests/xml/Makefile.am
index d9abd5cd..f5638fcb 100644
--- a/tests/xml/Makefile.am
+++ b/tests/xml/Makefile.am
@@ -15,6 +15,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+# Old RHEL 5 autoconf doesn't have abs_srcdir.
+abs_srcdir ?= $(shell cd $(top_srcdir)/tests/xml && pwd)
+
 include $(top_srcdir)/subdir-rules.mk
 
 if HAVE_LIBVIRT