diff --git a/plugins/Later/test.py b/plugins/Later/test.py
index 980918f9d..2e36978c4 100644
--- a/plugins/Later/test.py
+++ b/plugins/Later/test.py
@@ -79,7 +79,7 @@ class LaterTestCase(ChannelPluginTestCase):
                                          prefix=testPrefix))
         m = self.getMsg(' ')
         self.assertEqual(str(m).strip(),
-                'PRIVMSG foo :Sent just now: <test> stuff')
+                'PRIVMSG #test :foo: Sent just now: <test> stuff')
         self.assertNotRegexp('later notes', 'foo')
         self.assertRegexp('later notes', 'bar')
 
@@ -91,7 +91,7 @@ class LaterTestCase(ChannelPluginTestCase):
                                          prefix='bar!baz@qux'))
         m = self.getMsg(' ')
         self.assertEqual(str(m).strip(),
-                'PRIVMSG bar :Sent 1 minute ago: <test> more stuff')
+                'PRIVMSG #test :bar: Sent 1 minute ago: <test> more stuff')
         time.time = real_time
         
 # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
diff --git a/plugins/Topic/test.py b/plugins/Topic/test.py
index 45738adf7..548d5f382 100644
--- a/plugins/Topic/test.py
+++ b/plugins/Topic/test.py
@@ -65,11 +65,11 @@ class TopicTestCase(ChannelPluginTestCase):
         m = self.getMsg('topic add foo')
         self.assertEqual(m.command, 'TOPIC')
         self.assertEqual(m.args[0], self.channel)
-        self.assertEqual(m.args[1], 'foo (test)')
+        self.assertEqual(m.args[1], 'foo')
         m = self.getMsg('topic add bar')
         self.assertEqual(m.command, 'TOPIC')
         self.assertEqual(m.args[0], self.channel)
-        self.assertEqual(m.args[1], 'foo (test) || bar (test)')
+        self.assertEqual(m.args[1], 'foo || bar')
 
     def testManageCapabilities(self):
         try:
@@ -93,9 +93,9 @@ class TopicTestCase(ChannelPluginTestCase):
 
     def testInsert(self):
         m = self.getMsg('topic add foo')
-        self.assertEqual(m.args[1], 'foo (test)')
+        self.assertEqual(m.args[1], 'foo')
         m = self.getMsg('topic insert bar')
-        self.assertEqual(m.args[1], 'bar (test) || foo (test)')
+        self.assertEqual(m.args[1], 'bar || foo')
 
     def testChange(self):
         _ = self.getMsg('topic add foo')
@@ -143,9 +143,9 @@ class TopicTestCase(ChannelPluginTestCase):
         _ = self.getMsg('topic add foo')
         self.assertRegexp('topic list', '1: foo')
         _ = self.getMsg('topic add bar')
-        self.assertRegexp('topic list', '1: foo .*2: bar')
+        self.assertRegexp('topic list', '1: foo.*2: bar')
         _ = self.getMsg('topic add baz')
-        self.assertRegexp('topic list', '1: foo .* 2: bar .* and 3: baz')
+        self.assertRegexp('topic list', '1: foo.* 2: bar.* and 3: baz')
 
     def testSet(self):
         _ = self.getMsg('topic add foo')