diff --git a/test/test_ChannelTopic.py b/test/test_ChannelTopic.py
new file mode 100644
index 000000000..fadb4331c
--- /dev/null
+++ b/test/test_ChannelTopic.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+
+###
+# Copyright (c) 2002, Jeremiah Fincher
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+###
+
+from test import *
+
+class TopicTestCase(PluginTestCase, PluginDocumentation):
+    plugins = ('Topic', 'AdminCommands')
+    def testAddtopic(self):
+        _ = self.getMsg('join #foo')
+        _ = self.getMsg(' ') # Get the WHO.
+        m = self.getMsg('addtopic #foo foo')
+        self.assertEqual(m.command, 'TOPIC')
+        self.assertEqual(m.args[0], '#foo')
+        self.assertEqual(m.args[1], 'foo (test)')
+        m = self.getMsg('addtopic #foo bar')
+        self.assertEqual(m.command, 'TOPIC')
+        self.assertEqual(m.args[0], '#foo')
+
+    def testChangetopic(self):
+        _ = self.getMsg('join #foo')
+        _ = self.getMsg(' ')
+        _ = self.getMsg('addtopic #foo foo')
+        _ = self.getMsg('addtopic #foo bar')
+        _ = self.getMsg('addtopic #foo baz')
+        self.assertRegexp('changetopic #foo -1 s/baz/biff/',
+                          r'foo.*bar.*biff')
+        self.assertRegexp('changetopic #foo 2 s/bar/baz/',
+                          r'foo.*baz.*biff')
+        self.assertRegexp('changetopic #foo 1 s/foo/bar/',
+                          r'bar.*baz.*biff')
+        self.assertRegexp('changetopic #foo -2 s/baz/bazz/',
+                          r'bar.*bazz.*biff')
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+