diff --git a/tests/Makefile.am b/tests/Makefile.am
index ba2b70aa..d5c1cf57 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.3 2003/04/06 08:13:25 rocky Exp $
+#   $Id: Makefile.am,v 1.4 2003/04/14 08:51:14 rocky Exp $
 #
 #    Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
 #
@@ -20,7 +20,7 @@
 # Things to regression testing
 ####################################################
 #
-check_SCRIPTS = check_nrg.sh check_cue.sh
+check_SCRIPTS = check_nrg.sh check_cue.sh check_opts.sh
 
 check_DATA = monvoisin.right svcd_ogt_test_ntsc.right vcd_demo.right \
 	     fsf-tompox.right fsf-tompox.cue fsf-tompox.bin monvoisin.nrg \
diff --git a/tests/check_cue.sh b/tests/check_cue.sh
index 35ff24c2..d65dbb48 100755
--- a/tests/check_cue.sh
+++ b/tests/check_cue.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_cue.sh,v 1.3 2003/04/14 04:28:40 rocky Exp $
+#$Id: check_cue.sh,v 1.4 2003/04/14 08:51:14 rocky Exp $
 
 if test -z $srcdir ; then
   srcdir=`pwd`
@@ -10,7 +10,7 @@ fi
 BASE=`basename $0 .sh`
 
 fname=fsf
-test_cdinfo "--cue-file ${srcdir}/${fname}.cue --nocddb" \
+test_cdinfo "--cue-file ${srcdir}/${fname}.cue --no-cddb" \
   ${fname}.dump ${srcdir}/${fname}.right
 RC=$?
 check_result $RC 'cdinfo CUE test 1'
diff --git a/tests/check_opts.sh b/tests/check_opts.sh
new file mode 100755
index 00000000..497e8585
--- /dev/null
+++ b/tests/check_opts.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+#$Id: check_opts.sh,v 1.1 2003/04/14 08:51:14 rocky Exp $
+# Check cdinfo options
+
+if test -z $srcdir ; then
+  srcdir=`pwd`
+fi
+
+. ${srcdir}/check_common_fn
+
+BASE=`basename $0 .sh`
+
+fname=fsf
+opts=('-T' '--no-tracks' '-A', '--no-analyze' '-I' '-no-ioctl' 
+      '-q' '--quiet')
+
+for (( i=0 ; i<${#opts[@]} ; i++ )) ; do 
+  testname=${BASE}$i
+  test_cdinfo "--cue-file ${srcdir}/${fname}.cue --no-cddb ${opts[$i]}" \
+    ${testname}.dump ${srcdir}/${testname}.right
+  RC=$?
+  check_result $RC "cdinfo option test $i"
+done
+
+exit $RC
+
+#;;; Local Variables: ***
+#;;; mode:shell-script ***
+#;;; eval: (sh-set-shell "bash") ***
+#;;; End: ***
diff --git a/tests/check_opts0.right b/tests/check_opts0.right
new file mode 100644
index 00000000..7ec8e65f
--- /dev/null
+++ b/tests/check_opts0.right
@@ -0,0 +1,7 @@
+CD Info 2.0 | (c) 2003 Gerd Knorr, Heiko Eißfeldt & R. Bernstein
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+try to find out what sort of CD this is
+Audio CD, CDDB disc ID is 02006c01
diff --git a/tests/check_opts1.right b/tests/check_opts1.right
new file mode 100644
index 00000000..7ec8e65f
--- /dev/null
+++ b/tests/check_opts1.right
@@ -0,0 +1,7 @@
+CD Info 2.0 | (c) 2003 Gerd Knorr, Heiko Eißfeldt & R. Bernstein
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+try to find out what sort of CD this is
+Audio CD, CDDB disc ID is 02006c01
diff --git a/tests/check_opts2.right b/tests/check_opts2.right
new file mode 100644
index 00000000..4992a236
--- /dev/null
+++ b/tests/check_opts2.right
@@ -0,0 +1,9 @@
+CD Info 2.0 | (c) 2003 Gerd Knorr, Heiko Eißfeldt & R. Bernstein
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+CD-ROM Track List (1 - 1)
+  #: MSF       LSN     Type
+  1: 00:02:00  000000  audio
+170: 01:50:20  008120  leadout
diff --git a/tests/check_opts3.right b/tests/check_opts3.right
new file mode 100644
index 00000000..4992a236
--- /dev/null
+++ b/tests/check_opts3.right
@@ -0,0 +1,9 @@
+CD Info 2.0 | (c) 2003 Gerd Knorr, Heiko Eißfeldt & R. Bernstein
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+CD-ROM Track List (1 - 1)
+  #: MSF       LSN     Type
+  1: 00:02:00  000000  audio
+170: 01:50:20  008120  leadout
diff --git a/tests/check_opts4.right b/tests/check_opts4.right
new file mode 100644
index 00000000..7d1ebf9c
--- /dev/null
+++ b/tests/check_opts4.right
@@ -0,0 +1,12 @@
+CD Info 2.0 | (c) 2003 Gerd Knorr, Heiko Eißfeldt & R. Bernstein
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+CD-ROM Track List (1 - 1)
+  #: MSF       LSN     Type
+  1: 00:02:00  000000  audio
+170: 01:50:20  008120  leadout
+__________________________________
+try to find out what sort of CD this is
+Audio CD, CDDB disc ID is 02006c01
diff --git a/tests/check_opts5.right b/tests/check_opts5.right
new file mode 100644
index 00000000..7d1ebf9c
--- /dev/null
+++ b/tests/check_opts5.right
@@ -0,0 +1,12 @@
+CD Info 2.0 | (c) 2003 Gerd Knorr, Heiko Eißfeldt & R. Bernstein
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+CD-ROM Track List (1 - 1)
+  #: MSF       LSN     Type
+  1: 00:02:00  000000  audio
+170: 01:50:20  008120  leadout
+__________________________________
+try to find out what sort of CD this is
+Audio CD, CDDB disc ID is 02006c01
diff --git a/tests/check_opts6.right b/tests/check_opts6.right
new file mode 100644
index 00000000..7d1ebf9c
--- /dev/null
+++ b/tests/check_opts6.right
@@ -0,0 +1,12 @@
+CD Info 2.0 | (c) 2003 Gerd Knorr, Heiko Eißfeldt & R. Bernstein
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+CD-ROM Track List (1 - 1)
+  #: MSF       LSN     Type
+  1: 00:02:00  000000  audio
+170: 01:50:20  008120  leadout
+__________________________________
+try to find out what sort of CD this is
+Audio CD, CDDB disc ID is 02006c01
diff --git a/tests/check_opts7.right b/tests/check_opts7.right
new file mode 100644
index 00000000..7d1ebf9c
--- /dev/null
+++ b/tests/check_opts7.right
@@ -0,0 +1,12 @@
+CD Info 2.0 | (c) 2003 Gerd Knorr, Heiko Eißfeldt & R. Bernstein
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+CD-ROM Track List (1 - 1)
+  #: MSF       LSN     Type
+  1: 00:02:00  000000  audio
+170: 01:50:20  008120  leadout
+__________________________________
+try to find out what sort of CD this is
+Audio CD, CDDB disc ID is 02006c01