diff --git a/test/test_irclib.py b/test/test_irclib.py
index 88fc42f59..ed651106f 100644
--- a/test/test_irclib.py
+++ b/test/test_irclib.py
@@ -38,7 +38,7 @@ import conf
 import irclib
 import ircmsgs
 
-class IrcMsgQueueTestCase(unittest.TestCase):
+class IrcMsgQueueTestCase(SupyTestCase):
     mode = ircmsgs.op('#foo', 'jemfinch')
     msg = ircmsgs.privmsg('#foo', 'hey, you')
     msgs = [ircmsgs.privmsg('#foo', str(i)) for i in range(10)]
@@ -159,7 +159,7 @@ class IrcMsgQueueTestCase(unittest.TestCase):
         self.assertEqual(self.msg, q.dequeue())
 
 
-class ChannelStateTestCase(unittest.TestCase):
+class ChannelStateTestCase(SupyTestCase):
     def testPickleCopy(self):
         c = irclib.ChannelState()
         self.assertEqual(pickle.loads(pickle.dumps(c)), c)
@@ -202,7 +202,7 @@ class ChannelStateTestCase(unittest.TestCase):
         self.failIf('quuz' in c.voices)
 
 
-class IrcStateTestCase(unittest.TestCase):
+class IrcStateTestCase(SupyTestCase):
     class FakeIrc:
         nick = 'nick'
         prefix = 'nick!user@host'
@@ -299,14 +299,8 @@ class IrcStateTestCase(unittest.TestCase):
         st = irclib.IrcState()
         self.assert_(st.addMsg(self.irc, ircmsgs.IrcMsg('MODE foo +i')) or 1)
 
-    """
-    def testChannels(self):
-        channel =
-        state = irclib.IrcState()
-        state.addMsg(self.irc, ircmsgs.join('#foo'))
-    """
 
-class IrcTestCase(unittest.TestCase):
+class IrcTestCase(SupyTestCase):
     def setUp(self):
         self.irc = irclib.Irc('nick')
         _ = self.irc.takeMsg() # NICK
@@ -317,6 +311,8 @@ class IrcTestCase(unittest.TestCase):
         self.assertEqual(ircmsgs.pong('123'), self.irc.takeMsg())
 
     def test433Response(self):
+        # This is necessary; it won't change nick if irc.originalName==irc.nick
+        self.irc.nick = 'somethingElse' 
         self.irc.feedMsg(ircmsgs.IrcMsg('433 * %s :Nickname already in use.' %\
                                         self.irc.nick))
         msg = self.irc.takeMsg()
@@ -361,7 +357,7 @@ class IrcTestCase(unittest.TestCase):
         self.assertEqual(list(self.irc.state.history), [msg1, msg2])
 
 
-class IrcCallbackTestCase(unittest.TestCase):
+class IrcCallbackTestCase(SupyTestCase):
     class FakeIrc:
         pass
     irc = FakeIrc()
diff --git a/test/test_ircutils.py b/test/test_ircutils.py
index 00863d10a..b3f06567f 100644
--- a/test/test_ircutils.py
+++ b/test/test_ircutils.py
@@ -38,7 +38,7 @@ import random
 import ircmsgs
 import ircutils
 
-class FunctionsTestCase(unittest.TestCase):
+class FunctionsTestCase(SupyTestCase):
     hostmask = 'foo!bar@baz'
     def testHostmaskPatternEqual(self):
         for msg in msgs:
@@ -193,7 +193,7 @@ class FunctionsTestCase(unittest.TestCase):
             self.assertEqual(ip, ircutils.unDccIP(ircutils.dccIP(ip)))
         
 
-class IrcDictTestCase(unittest.TestCase):
+class IrcDictTestCase(SupyTestCase):
     def test(self):
         d = ircutils.IrcDict()
         d['#FOO'] = 'bar'
@@ -243,7 +243,7 @@ class IrcDictTestCase(unittest.TestCase):
         self.failUnless(d == copy.copy(d))
         self.failUnless(d == copy.deepcopy(d))
 
-class IrcSetTestCase(unittest.TestCase):
+class IrcSetTestCase(SupyTestCase):
     def test(self):
         s = ircutils.IrcSet()
         s.add('foo')
@@ -275,7 +275,7 @@ class IrcSetTestCase(unittest.TestCase):
 
         
 
-class IrcStringTestCase(unittest.TestCase):
+class IrcStringTestCase(SupyTestCase):
     def testEquality(self):
         self.assertEqual('#foo', ircutils.IrcString('#foo'))
         self.assertEqual('#foo', ircutils.IrcString('#FOO'))