diff --git a/test/check_nrg.sh.in b/test/check_nrg.sh.in
index f1c0b076..5f0901a8 100755
--- a/test/check_nrg.sh.in
+++ b/test/check_nrg.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_nrg.sh.in,v 1.11 2004/09/04 00:06:50 rocky Exp $
+#$Id: check_nrg.sh.in,v 1.12 2005/02/17 04:29:24 rocky Exp $
 
 if test -n "@VCDINFO_LIBS@" ; then
   vcd_opt='--no-vcd'
@@ -17,11 +17,10 @@ fi
 
 BASE=`basename $0 .sh`
 test_name=videocd
-
-test_cdinfo "--quiet --no-device-info --nrg-file ${srcdir}/${test_name}.nrg $vcd_opt --iso9660 " \
-  ${test_name}.dump ${srcdir}/${test_name}.right
+opts="--quiet --no-device-info --nrg-file ${srcdir}/${test_name}.nrg $vcd_opt --iso9660"
+test_cdinfo "$opts" ${test_name}.dump ${srcdir}/${test_name}.right
 RC=$?
-check_result $RC 'cd-info NRG test 1'
+check_result $RC 'cd-info NRG test 1' "${CD_INFO} $opts"
 
 BASE=`basename $0 .sh`
 nrg_file=${srcdir}/monvoisin.nrg
@@ -37,25 +36,24 @@ else
 fi
 
 test_name='svcdgs'
+opts="-q --no-device-info --nrg-file $nrg_file $vcd_opt --iso9660"
 nrg_file=${srcdir}/${test_name}.nrg
 if test -f  $nrg_file ; then
-  test_cdinfo "-q --no-device-info --nrg-file $nrg_file $vcd_opt --iso9660" \
-    ${test_name}.dump ${srcdir}/${test_name}.right
+  test_cdinfo "$opts" ${test_name}.dump ${srcdir}/${test_name}.right
   RC=$?
-  check_result $RC "cd-info NRG $test_name"
+  check_result $RC "cd-info NRG $test_name" "${CD_INFO} $opts"
 else 
   echo "Don't see NRG file ${nrg_file}. Test skipped."
   exit $SKIP_TEST_EXITCODE
 fi
 
 test_name='cdda-mcn'
+opts="-q --no-device-info --nrg-file $nrg_file --no-cddb"
 nrg_file=${srcdir}/${test_name}.nrg
 if test -f  $nrg_file ; then
-  test_cdinfo "-q --no-device-info --nrg-file $nrg_file --no-cddb" \
-    ${test_name}.dump ${srcdir}/${test_name}.right
+  test_cdinfo $opts ${test_name}.dump ${srcdir}/${test_name}.right
   RC=$?
-  check_result $RC "cd-info NRG $test_name"
-  
+  check_result $RC "cd-info NRG $test_name" "${CD_INFO} $opts"
   exit $RC
 else 
   echo "Don't see NRG file ${nrg_file}. Test skipped."