diff --git a/test/check_paranoia.sh.in b/test/check_paranoia.sh.in
index 3821318a..d0a3ed39 100644
--- a/test/check_paranoia.sh.in
+++ b/test/check_paranoia.sh.in
@@ -1,11 +1,15 @@
 #!/bin/sh
-# $Id: check_paranoia.sh.in,v 1.8 2005/03/02 12:49:28 rocky Exp $
+# $Id: check_paranoia.sh.in,v 1.9 2005/03/02 13:33:24 rocky Exp $
 # Compare our cd-paranoia with an installed cdparanoia
 
 if test -z $srcdir ; then
   srcdir=`pwd`
 fi
 
+if test -z $top_builddir ; then
+  top_builddir=`pwd`/..
+fi
+
 if test -z $top_srcdir ; then
   top_srcdir=`pwd`/..
 fi
@@ -24,9 +28,9 @@ if test "@CMP@" != no -a "@BUILD_CD_PARANOIA_TRUE@"X = X ; then
     exit 3
   fi
   mv cdda.raw cdda-good.raw
-  $top_srcdir/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -x 64 -v -r -- "1-"
+  $top_builddir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -x 64 -v -r -- "1-"
   mv cdda.raw cdda-underrun.raw
-  $top_srcdir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -r -- "1-"
+  $top_builddir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -r -- "1-"
   if test $? -ne 0 ; then
     exit 6
   fi
@@ -37,24 +41,24 @@ if test "@CMP@" != no -a "@BUILD_CD_PARANOIA_TRUE@"X = X ; then
     exit 3
   fi
   # Start out with small jitter
-  $top_srcdir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -x 5 -v -r -- "1-"
+  $top_builddir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -x 5 -v -r -- "1-"
   if test $? -ne 0 ; then
     exit 6
   fi
   mv cdda.raw cdda-jitter.raw
-  if @CMP@ $srcdir/cdda-jitter.raw $srcdir/cdda-good.raw ; then
+  if @CMP@ cdda-jitter.raw cdda-good.raw ; then
     echo "** Small jitter correction okay"
   else
     echo "** Small jitter correction problem"
     exit 3
   fi
   # A more massive set of failures: underrun + medium jitter
-  $top_srcdir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -x 70 -v -r -- "1-"
+  $top_builddir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -x 70 -v -r -- "1-"
   if test $? -ne 0 ; then
     exit 6
   fi
   mv cdda.raw cdda-jitter.raw
-  if @CMP@ $srcdir/cdda-jitter.raw $srcdir/cdda-good.raw ; then
+  if @CMP@ cdda-jitter.raw cdda-good.raw ; then
     echo "** under-run + jitter correction okay"
   else
     echo "** under-run + jitter correction problem"