diff --git a/test/check_cue.sh.in b/test/check_cue.sh.in
index 8b1876dc..80323484 100644
--- a/test/check_cue.sh.in
+++ b/test/check_cue.sh.in
@@ -1,13 +1,11 @@
 #!/bin/sh
-#$Id: check_cue.sh.in,v 1.7 2003/08/31 15:52:56 rocky Exp $
-if test -z "@CDDB_LIB@" ; then
+#$Id: check_cue.sh.in,v 1.8 2003/09/01 02:02:59 rocky Exp $
+if test -z "@CDDB_LIBS@" ; then
   cddb_opt='--no-cddb'
 fi
 
 if test -z "@VCDINFO_LIBS@" ; then
   vcd_opt='--no-vcd'
-else 
-  vcd_opt='--iso9660'
 fi
 
 if test -z $srcdir ; then
@@ -48,7 +46,7 @@ fi
 fname=vcd_demo
 testnum='Video CD'
 if test -f ${srcdir}/${fname}.cue ; then
-  test_cdinfo "-c ${srcdir}/vcd_demo.cue $vcd_opt" \
+  test_cdinfo "-c ${srcdir}/vcd_demo.cue $vcd_opt --iso9660" \
       ${fname}.dump ${srcdir}/${fname}.right
   RC=$?
   check_result $RC "cdinfo CUE test $testnum"
@@ -59,7 +57,7 @@ fi
 fname=svcd_ogt_test_ntsc
 testnum='Super Video CD'
 if test -f ${srcdir}/${fname}.bin ; then
-  test_cdinfo "--cue-file ${srcdir}/${fname}.cue $vcd_opt" \
+  test_cdinfo "--cue-file ${srcdir}/${fname}.cue $vcd_opt --iso9660 " \
     ${fname}.dump ${srcdir}/${fname}.right
   RC=$?
   check_result $RC "cdinfo CUE test $testnum"
diff --git a/test/check_nrg.sh.in b/test/check_nrg.sh.in
index fcdf2f31..e41a6039 100755
--- a/test/check_nrg.sh.in
+++ b/test/check_nrg.sh.in
@@ -1,10 +1,8 @@
 #!/bin/sh
-#$Id: check_nrg.sh.in,v 1.5 2003/08/31 08:32:40 rocky Exp $
+#$Id: check_nrg.sh.in,v 1.6 2003/09/01 02:02:59 rocky Exp $
 
 if test -z "@VCDINFO_LIBS@" ; then
   vcd_opt='--no-vcd'
-else 
-  vcd_opt='--iso9660'
 fi
 
 if test -z $srcdir ; then
@@ -20,7 +18,7 @@ fi
 BASE=`basename $0 .sh`
 fname=videocd
 
-test_cdinfo "--nrg-file ${srcdir}/${fname}.nrg $vcd_opt " \
+test_cdinfo "--nrg-file ${srcdir}/${fname}.nrg $vcd_opt --iso9660 " \
   ${fname}.dump ${srcdir}/${fname}.right
 RC=$?
 check_result $RC 'cd-info NRG test 1'
@@ -29,7 +27,7 @@ BASE=`basename $0 .sh`
 nrg_file=${srcdir}/monvoisin.nrg
 
 if test -f  $nrg_file ; then
-  test_cdinfo "--nrg-file $nrg_file $vcd_opt " \
+  test_cdinfo "--nrg-file $nrg_file $vcd_opt --iso9660 " \
     monvoisin.dump ${srcdir}/monvoisin.right
   RC=$?
   check_result $RC 'cd-info NRG test 2'
@@ -40,7 +38,7 @@ fi
 
 nrg_file=${srcdir}/svcdgs.nrg
 if test -f  $nrg_file ; then
-  test_cdinfo "--nrg-file $nrg_file $vcd_opt " \
+  test_cdinfo "--nrg-file $nrg_file $vcd_opt --iso9660" \
     svcdgs.dump ${srcdir}/svcdgs.right
   RC=$?
   check_result $RC 'cd-info NRG test 3'