diff --git a/ChangeLog b/ChangeLog
index 06e1599..5fe03c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-04-11  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/test (added):
+	* morituri/test/test_image_cue.py (added):
+	* morituri/test/kings-single.cue (added):
+	* morituri/test/__init__.py (added):
+	* morituri/test/kings-separate.cue (added):
+	  Add test suite.  Add Kings Of Leon cue files.
+
 2009-04-11  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* examples/ARcue.py:
diff --git a/morituri/test/__init__.py b/morituri/test/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/morituri/test/kings-separate.cue b/morituri/test/kings-separate.cue
new file mode 100644
index 0000000..020aaf0
--- /dev/null
+++ b/morituri/test/kings-separate.cue
@@ -0,0 +1,61 @@
+REM GENRE Alternative
+REM DATE 2008
+REM DISCID 9809FF0B
+REM COMMENT "ExactAudioCopy v0.99pb4"
+PERFORMER "Kings of Leon"
+TITLE "Only By the Night"
+FILE "Kings of Leon - Only By the Night\Kings of Leon - Closer.wav" WAVE
+  TRACK 01 AUDIO
+    TITLE "Closer"
+    PERFORMER "Kings of Leon"
+    INDEX 01 00:00:00
+FILE "Kings of Leon - Only By the Night\Kings of Leon - Crawl.wav" WAVE
+  TRACK 02 AUDIO
+    TITLE "Crawl"
+    PERFORMER "Kings of Leon"
+    INDEX 01 00:00:00
+FILE "Kings of Leon - Only By the Night\Kings of Leon - Sex On Fire.wav" WAVE
+  TRACK 03 AUDIO
+    TITLE "Sex On Fire"
+    PERFORMER "Kings of Leon"
+    INDEX 01 00:00:00
+FILE "Kings of Leon - Only By the Night\Kings of Leon - Use Somebody.wav" WAVE
+  TRACK 04 AUDIO
+    TITLE "Use Somebody"
+    PERFORMER "Kings of Leon"
+    INDEX 01 00:00:00
+FILE "Kings of Leon - Only By the Night\Kings of Leon - Manhattan.wav" WAVE
+  TRACK 05 AUDIO
+    TITLE "Manhattan"
+    PERFORMER "Kings of Leon"
+    INDEX 01 00:00:00
+FILE "Kings of Leon - Only By the Night\Kings of Leon - Revelry.wav" WAVE
+  TRACK 06 AUDIO
+    TITLE "Revelry"
+    PERFORMER "Kings of Leon"
+    INDEX 01 00:00:00
+FILE "Kings of Leon - Only By the Night\Kings of Leon - 17.wav" WAVE
+  TRACK 07 AUDIO
+    TITLE "17"
+    PERFORMER "Kings of Leon"
+    INDEX 01 00:00:00
+FILE "Kings of Leon - Only By the Night\Kings of Leon - Notion.wav" WAVE
+  TRACK 08 AUDIO
+    TITLE "Notion"
+    PERFORMER "Kings of Leon"
+    INDEX 01 00:00:00
+FILE "Kings of Leon - Only By the Night\Kings of Leon - I Want You.wav" WAVE
+  TRACK 09 AUDIO
+    TITLE "I Want You"
+    PERFORMER "Kings of Leon"
+    INDEX 01 00:00:00
+FILE "Kings of Leon - Only By the Night\Kings of Leon - Be Somebody.wav" WAVE
+  TRACK 10 AUDIO
+    TITLE "Be Somebody"
+    PERFORMER "Kings of Leon"
+    INDEX 01 00:00:00
+FILE "Kings of Leon - Only By the Night\Kings of Leon - Cold Desert.wav" WAVE
+  TRACK 11 AUDIO
+    TITLE "Cold Desert"
+    PERFORMER "Kings of Leon"
+    INDEX 01 00:00:00
diff --git a/morituri/test/kings-single.cue b/morituri/test/kings-single.cue
new file mode 100644
index 0000000..fab26c5
--- /dev/null
+++ b/morituri/test/kings-single.cue
@@ -0,0 +1,23 @@
+FILE "dummy.wav" WAVE
+  TRACK 01 AUDIO
+    INDEX 01 00:00:00
+  TRACK 02 AUDIO
+    INDEX 01 03:57:36
+  TRACK 03 AUDIO
+    INDEX 01 08:03:67
+  TRACK 04 AUDIO
+    INDEX 01 11:27:18
+  TRACK 05 AUDIO
+    INDEX 01 15:18:00
+  TRACK 06 AUDIO
+    INDEX 01 18:42:17
+  TRACK 07 AUDIO
+    INDEX 01 22:03:72
+  TRACK 08 AUDIO
+    INDEX 01 25:09:25
+  TRACK 09 AUDIO
+    INDEX 01 28:10:13
+  TRACK 10 AUDIO
+    INDEX 01 33:17:47
+  TRACK 11 AUDIO
+    INDEX 01 37:04:58
diff --git a/morituri/test/test_image_cue.py b/morituri/test/test_image_cue.py
new file mode 100644
index 0000000..9c0d34f
--- /dev/null
+++ b/morituri/test/test_image_cue.py
@@ -0,0 +1,35 @@
+# -*- Mode: Python; test-case-name: morituri.test.test_image_cue -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
+import os
+import unittest
+
+from morituri.image import cue
+
+class KingsSingleTestCase(unittest.TestCase):
+    def setUp(self):
+        self.cue = cue.Cue(os.path.join(os.path.dirname(__file__),
+            'kings-single.cue'))
+        self.cue.parse()
+        self.assertEquals(len(self.cue.tracks), 11)
+
+    def testGetTrackLength(self):
+        t = self.cue.tracks[0]
+        self.assertEquals(self.cue.getTrackLength(t), 17811)
+        # last track has unknown length
+        t = self.cue.tracks[-1]
+        self.assertEquals(self.cue.getTrackLength(t), -1)
+
+class KingsSeparateTestCase(unittest.TestCase):
+    def setUp(self):
+        self.cue = cue.Cue(os.path.join(os.path.dirname(__file__),
+            'kings-separate.cue'))
+        self.cue.parse()
+        self.assertEquals(len(self.cue.tracks), 11)
+
+    def testGetTrackLength(self):
+        # all tracks have unknown length
+        t = self.cue.tracks[0]
+        self.assertEquals(self.cue.getTrackLength(t), -1)
+        t = self.cue.tracks[-1]
+        self.assertEquals(self.cue.getTrackLength(t), -1)