diff --git a/tests/Makefile.am b/tests/Makefile.am
index 451bba54..970a94a3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.1 2003/03/24 19:01:10 rocky Exp $
+#   $Id: Makefile.am,v 1.2 2003/04/06 06:46:52 rocky Exp $
 #
 #    Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
 #
@@ -22,7 +22,8 @@
 #
 check_SCRIPTS = check_nrg.sh check_cue.sh
 
-check_DATA = monvoisin.right svcd_ogt_test_ntsc.right vcd_demo.right
+check_DATA = monvoisin.right svcd_ogt_test_ntsc.right vcd_demo.right \
+	     fsf-tompox.right fsf-tompox.cue fsf-tompox.bin
 
 EXTRA_DIST = $(check_SCRIPTS) $(check_DATA) \
 	check_common_fn 
diff --git a/tests/check_cue.sh b/tests/check_cue.sh
index bcd99d5c..b5f388a9 100755
--- a/tests/check_cue.sh
+++ b/tests/check_cue.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_cue.sh,v 1.1 2003/03/24 19:01:10 rocky Exp $
+#$Id: check_cue.sh,v 1.2 2003/04/06 06:46:52 rocky Exp $
 
 if test -z $srcdir ; then
   srcdir=`pwd`
@@ -9,16 +9,34 @@ fi
 
 BASE=`basename $0 .sh`
 
-test_cdinfo "--cue-file ${srcdir}/svcd_ogt_test_ntsc.cue" \
-  svcd_ogt_test_ntsc.dump ${srcdir}/svcd_ogt_test_ntsc.right
+fname=fsf
+test_cdinfo "--cue-file ${srcdir}/${fname}.cue" \
+  ${fname}.dump ${srcdir}/${fname}.right
 RC=$?
 check_result $RC 'cdinfo CUE test 1'
 
-test_cdinfo "-c ${srcdir}/vcd_demo.cue" \
-    vcd_demo.dump ${srcdir}/vcd_demo.right
+fname=fsf-tompox
+test_cdinfo "--cue-file ${srcdir}/${fname}.cue" \
+  ${fname}.dump ${srcdir}/${fname}.right
 RC=$?
 check_result $RC 'cdinfo CUE test 2'
 
+fname=svcd_ogt_test_ntsc
+if test -f ${srcdir}/${fname}.cue ; then
+  test_cdinfo "--cue-file ${srcdir}/${fname}.cue" \
+    ${fname}.dump ${srcdir}/${fname}.right
+  RC=$?
+  check_result $RC 'cdinfo CUE test 3'
+fi
+
+fname=vcd_demo
+if test -f ${srcdir}/${fname}.cue ; then
+  test_cdinfo "-c ${srcdir}/vcd_demo.cue" \
+      ${fname}.dump ${srcdir}/${fname}.right
+  RC=$?
+  check_result $RC 'cdinfo CUE test 4'
+fi
+
 exit $RC
 
 #;;; Local Variables: ***
diff --git a/tests/fsf-tompox.bin b/tests/fsf-tompox.bin
new file mode 100644
index 00000000..c9c9238d
Binary files /dev/null and b/tests/fsf-tompox.bin differ
diff --git a/tests/fsf-tompox.right b/tests/fsf-tompox.right
new file mode 100644
index 00000000..c52aac94
--- /dev/null
+++ b/tests/fsf-tompox.right
@@ -0,0 +1,13 @@
+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  data
+170: 00:25:34  001759  leadout
+__________________________________
+try to find out what sort of CD this is
+CD-ROM with ISO 9660 filesystem and joliet extension level 3
+ISO 9660: 1744 blocks, label `Free Software Song              '
diff --git a/tests/fsf.right b/tests/fsf.right
new file mode 100644
index 00000000..7d1ebf9c
--- /dev/null
+++ b/tests/fsf.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/svcd_ogt_test_ntsc.bin b/tests/svcd_ogt_test_ntsc.bin
new file mode 100644
index 00000000..988e1dae
Binary files /dev/null and b/tests/svcd_ogt_test_ntsc.bin differ
diff --git a/tests/vcd_demo.bin b/tests/vcd_demo.bin
new file mode 100644
index 00000000..acd2735c
Binary files /dev/null and b/tests/vcd_demo.bin differ