diff --git a/test/Makefile.am b/test/Makefile.am
index 54ec33d5..69f8bf50 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.40 2005/01/14 21:40:33 rocky Exp $
+#   $Id: Makefile.am,v 1.41 2005/01/15 10:17:17 rocky Exp $
 #
 #    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 #
@@ -49,7 +49,7 @@ testbincue_LDADD    = $(LIBCDIO_LIBS)
 testbincue_CFLAGS   = -DTEST_DIR=\"$(srcdir)\"
 
 check_SCRIPTS = check_nrg.sh  check_cue.sh  check_cd_read.sh \
-                check_iso.sh  check_opts.sh
+                check_iso.sh  check_paranoia.sh check_opts.sh
 # If we beefed this up so it checked to see if a CD-DA was loaded
 # it could be an automatic test. But for now, not so.
 #               check_paranoia.sh
diff --git a/test/check_paranoia.sh.in b/test/check_paranoia.sh.in
index 05fc8ee1..6bf542b6 100644
--- a/test/check_paranoia.sh.in
+++ b/test/check_paranoia.sh.in
@@ -1,29 +1,23 @@
 #!/bin/sh
-# $Id: check_paranoia.sh.in,v 1.1 2004/12/19 00:02:09 rocky Exp $
+# $Id: check_paranoia.sh.in,v 1.2 2005/01/15 10:17:17 rocky Exp $
 # Compare our cd-paranoia with an installed cdparanoia
 
-if test "@OLD_CDPARANOIA@" != no -a -x @OLD_CDPARANOIA@ ; then
-  if test "@CMP@" != no -a -x @OLD_CDPARANOIA@ ; then
-    for opt in '' '-r' '-p' '-f' '-a'  ; do
-      frames='"1[:130]-1[:134]"'
-      ../src/cd-paranoia/cd-paranoia $frames cdda-try.wav
-      @OLD_CDPARANOIA@ $frames cdda-orig.wav
-      if @CMP@ cdda-try.wav cdda-orig.wav ; then
-        echo "** New and old paranoia output are identical using option '$opt'"
-      else
-        echo "** New and old paranoia output differ using option $opt"
-        exit 3
-      fi
-    done
-    exit 0
-  else 
-    echo "Don't see libcdio cd-paranoia program. Test skipped."
-    exit 77
+if test "@CMP@" != no -a "@BUILD_CD_PARANOIA_TRUE@"X = X ; then
+  ../src/cd-paranoia/cd-paranoia -d ./cdda.cue -v -r -- "1-"
+  dd bs=16 skip=17 if=./cdda.raw of=./cdda-1.raw
+  dd bs=16 if=./cdda.bin of=cdda-2.raw count=44377
+  if @CMP@ ./cdda-1.raw ./cdda-2.raw ; then
+    echo "** Raw cdda.bin extraction okay"
+  else
+    echo "** Raw cdda.bin extraction differ"
+    exit 3
   fi
-else
-    echo "Don't see non-libcdio cdparanoia program. Test skipped."
+  exit 0
+else 
+  echo "Don't see libcdio cd-paranoia program. Test skipped."
   exit 77
 fi
+fi
 #;;; Local Variables: ***
 #;;; mode:shell-script ***
 #;;; eval: (sh-set-shell "bash") ***