diff --git a/test/check_common_fn.in b/test/check_common_fn.in
index 532bce94..a175682a 100755
--- a/test/check_common_fn.in
+++ b/test/check_common_fn.in
@@ -1,4 +1,4 @@
-#   $Id: check_common_fn.in,v 1.13 2008/03/22 18:08:25 karl Exp $
+#   $Id: check_common_fn.in,v 1.14 2008/10/17 01:51:43 rocky Exp $
 #
 #   Copyright (C) 2003, 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
 #
@@ -52,7 +52,7 @@ test_cdinfo() {
   outfile="$2"
   rightfile="$3"
 
-  CD_INFO="../src/cd-info"
+  CD_INFO="../src/cd-info@EXEEXT@"
 
   if [ ! -x ${CD_INFO} ]; then
     echo "$0: No ${CD_INFO}"
@@ -85,7 +85,7 @@ test_iso_info() {
   outfile="$2"
   rightfile="$3"
 
-  ISO_INFO="../src/iso-info"
+  ISO_INFO="../src/iso-info@EXEEXT@"
 
   if [ ! -x ${ISO_INFO} ]; then
     echo "$0: No ${ISO_INFO}"
@@ -119,7 +119,7 @@ test_iso_read() {
   outfile="$2"
   rightfile="$3"
 
-  ISO_READ="../src/iso-read"
+  ISO_READ="../src/iso-read@EXEEXT@"
 
   if [ ! -x ${ISO_READ} ]; then
     echo "$0: No ${ISO_READ}"
@@ -152,7 +152,7 @@ test_cd_read() {
   outfile="$2"
   rightfile="$3"
 
-  CD_READ="../src/cd-read"
+  CD_READ="../src/cd-read@EXEEXT@"
 
   if [ ! -x ${CD_READ} ]; then
     echo "$0: No ${CD_READ}"
diff --git a/test/check_iso.sh.in b/test/check_iso.sh.in
index 0c6dbd02..ed4efbf2 100644
--- a/test/check_iso.sh.in
+++ b/test/check_iso.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_iso.sh.in,v 1.14 2007/12/28 02:11:01 rocky Exp $
+#$Id: check_iso.sh.in,v 1.15 2008/10/17 01:51:47 rocky Exp $
 
 if test -z $srcdir ; then
   srcdir=`pwd`
@@ -11,7 +11,7 @@ fi
 
 . ${top_builddir}/test/check_common_fn
 
-if test ! -x ../src/iso-info ; then
+if test ! -x ../src/iso-info@EXEEXT@ ; then
   exit 77
 fi
 
diff --git a/test/check_paranoia.sh.in b/test/check_paranoia.sh.in
index 28bbb95c..b955b7ba 100644
--- a/test/check_paranoia.sh.in
+++ b/test/check_paranoia.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: check_paranoia.sh.in,v 1.17 2008/03/20 00:45:56 edsdead Exp $
+# $Id: check_paranoia.sh.in,v 1.18 2008/10/17 01:51:47 rocky Exp $
 # Compare our cd-paranoia with known good results.
 
 if test "X$srcdir" = "X" ; then
@@ -15,7 +15,8 @@ if test "X$top_srcdir" = "X" ; then
 fi
 
 if test "@CMP@" != no -a "@BUILD_CD_PARANOIA_TRUE@"X = X ; then
-  $top_srcdir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -v -r -- "1-"
+  cd_paranoia=$top_builddir/src/cd-paranoia/cd-paranoia@EXEEXT@ 
+  $cd_paranoia -d $srcdir/cdda.cue -v -r -- "1-"
   if test $? -ne 0 ; then
     exit 6
   fi
@@ -28,9 +29,9 @@ if test "@CMP@" != no -a "@BUILD_CD_PARANOIA_TRUE@"X = X ; then
     exit 3
   fi
   mv cdda.raw cdda-good.raw
-  $top_builddir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -x 64 -v -r -- "1-"
+  $cd_paranoia -d $srcdir/cdda.cue -x 64 -v -r -- "1-"
   mv cdda.raw cdda-underrun.raw
-  $top_builddir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -r -- "1-"
+  $cd_paranoia -d $srcdir/cdda.cue -r -- "1-"
   if test $? -ne 0 ; then
     exit 6
   fi
@@ -41,7 +42,7 @@ if test "@CMP@" != no -a "@BUILD_CD_PARANOIA_TRUE@"X = X ; then
     exit 3
   fi
   # Start out with small jitter
-  $top_builddir/src/cd-paranoia/cd-paranoia -l ./cd-paranoia.log -d $srcdir/cdda.cue -x 5 -v -r -- "1-"
+  $cd_paranoia -l ./cd-paranoia.log -d $srcdir/cdda.cue -x 5 -v -r -- "1-"
   if test $? -ne 0 ; then
     exit 6
   fi
@@ -61,7 +62,7 @@ if test "@CMP@" != no -a "@BUILD_CD_PARANOIA_TRUE@"X = X ; then
     exit 4
   fi
   # A more massive set of failures: underrun + small jitter
-  $top_builddir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -x 69 -v -r -- "1-"
+  $cd_paranoia -d $srcdir/cdda.cue -x 69 -v -r -- "1-"
   if test $? -ne 0 ; then
     exit 6
   fi