diff --git a/Lib/plat-irix6/cdplayer.py b/Lib/plat-irix6/cdplayer.py
index 0f7983b..9664b2c 100644
--- a/Lib/plat-irix6/cdplayer.py
+++ b/Lib/plat-irix6/cdplayer.py
@@ -85,7 +85,7 @@
         new.write(self.id + '.title:\t' + self.title + '\n')
         new.write(self.id + '.artist:\t' + self.artist + '\n')
         for i in range(1, len(self.track)):
-            new.write('%s.track.%r:\t%s\n' % (i, track))
+            new.write('%s.track.%r:\t%s\n' % (self.id, i, self.track[i]))
         old.close()
         new.close()
         posix.rename(filename + '.new', filename)
diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index cc36ed7..9328db0 100755
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -119,16 +119,15 @@
             try:
                 result = time.strftime(e[0], now)
             except ValueError, error:
-                print "Standard '%s' format gaver error:" % (e[0], error)
-                continue
+                self.fail("strftime '%s' format gave error: %s" % (e[0], error))
             if re.match(escapestr(e[1], self.ampm), result):
                 continue
             if not result or result[0] == '%':
-                print "Does not support standard '%s' format (%s)" % \
-                       (e[0], e[2])
+                self.fail("strftime does not support standard '%s' format (%s)"
+                          % (e[0], e[2]))
             else:
-                print "Conflict for %s (%s):" % (e[0], e[2])
-                print "  Expected %s, but got %s" % (e[1], result)
+                self.fail("Conflict for %s (%s): expected %s, but got %s"
+                          % (e[0], e[2], e[1], result))
 
     def strftest2(self, now):
         nowsecs = str(long(now))[:-1]