diff --git a/configure.ac b/configure.ac
index 01a48d47..0b2d1c51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ define(RELEASE_NUM, 81)
 define(CDIO_VERSION_STR, 0.$1cvs)
 
 AC_PREREQ(2.52)
-AC_REVISION([$Id: configure.ac,v 1.225 2008/04/24 07:28:00 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.226 2008/05/05 23:58:28 rocky Exp $])dnl
 AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
 AC_CONFIG_SRCDIR(src/cd-info.c)
 
@@ -742,6 +742,7 @@ AC_CONFIG_FILES([
        src/Makefile \
        test/testbincue.c \
        test/testisocd2.c \
+       test/testpregap.c \
        test/testnrg.c \
        test/check_common_fn \
        test/Makefile \
diff --git a/test/Makefile.am b/test/Makefile.am
index c0758de9..4d29d046 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.66 2008/03/28 01:28:50 rocky Exp $
+#   $Id: Makefile.am,v 1.67 2008/05/05 23:58:28 rocky Exp $
 #
 #   Copyright (C) 2003, 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
 #
@@ -88,7 +88,8 @@ check_DATA = vcd_demo.right vcd_demo_vcdinfo.right \
 
 EXTRA_DIST = $(check_SCRIPTS) $(check_DATA) \
 	check_common_fn check_cue.sh.in check_nrg.sh.in \
-	testbincue.c.in testnrg.c.in check_iso.sh.in p1.bin p1.cue p1.nrg
+	testbincue.c.in testpregap.c.in testnrg.c.in \
+	check_iso.sh.in p1.bin p1.cue p1.nrg
 
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS) 
 XFAIL_TESTS = testassert
diff --git a/test/testpregap.c b/test/testpregap.c.in
similarity index 86%
rename from test/testpregap.c
rename to test/testpregap.c.in
index 4d4990cc..529e9c61 100644
--- a/test/testpregap.c
+++ b/test/testpregap.c.in
@@ -1,5 +1,5 @@
 /*
-  $Id: testpregap.c,v 1.2 2008/03/22 18:08:25 karl Exp $
+  $Id: testpregap.c.in,v 1.1 2008/05/05 23:58:28 rocky Exp $
 
   Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@gnu.org>
   Copyright (C) 2008 Robert W. Fuller <hydrologiccycle@gmail.com>
@@ -39,6 +39,10 @@
 #endif
 #include <string.h>
 
+#ifndef TEST_DIR
+#define TEST_DIR "@srcdir@"
+#endif
+
 static void 
 log_handler (cdio_log_level_t level, const char message[])
 {
@@ -61,14 +65,14 @@ typedef struct _pregap_list_t {
 
 static pregap_list_t pregapList[] =
 {
-    { "t2.toc", 1, 4425 },
-    { "t2.toc", 2, CDIO_INVALID_LSN },
-    { "p1.cue", 1, 0 },
-    { "p1.cue", 2, 150 },
-    { "p1.cue", 3, CDIO_INVALID_LSN },
+    { "@srcdir@/t2.toc", 1, 4425 },
+    { "@srcdir@/t2.toc", 2, CDIO_INVALID_LSN },
+    { "@srcdir@/p1.cue", 1, 0 },
+    { "@srcdir@/p1.cue", 2, 150 },
+    { "@srcdir@/p1.cue", 3, CDIO_INVALID_LSN },
 /*    { "p1.nrg", 1, 0 }, Nero did not create the proper pre-gap - bleh */
-    { "p1.nrg", 2, 225 },
-    { "p1.nrg", 3, CDIO_INVALID_LSN }
+    { "@srcdir@/p1.nrg", 2, 225 },
+    { "@srcdir@/p1.nrg", 3, CDIO_INVALID_LSN }
 };
 
 #define NELEMS(v) (sizeof(v) / sizeof(v[0]))