diff --git a/plugins/Markov.py b/plugins/Markov.py
index 769e561ef..866fdf37b 100644
--- a/plugins/Markov.py
+++ b/plugins/Markov.py
@@ -162,7 +162,7 @@ class Markov(plugins.ChannelDBHandler, callbacks.Privmsg):
         else:
             irc.reply(msg, ' '.join(words))
 
-    def markovpairs(self, irc, msg, args):
+    def pairs(self, irc, msg, args):
         """[<channel>]
 
         Returns the number of Markov's chain links in the database for
@@ -176,7 +176,7 @@ class Markov(plugins.ChannelDBHandler, callbacks.Privmsg):
         s = 'There are %s pairs in my Markov database for %s' % (n, channel)
         irc.reply(msg, s)
 
-    def markovfirsts(self, irc, msg, args):
+    def firsts(self, irc, msg, args):
         """[<channel>]
 
         Returns the number of Markov's first links in the database for
@@ -190,7 +190,7 @@ class Markov(plugins.ChannelDBHandler, callbacks.Privmsg):
         s = 'There are %s first pairs in my Markov database for %s'%(n,channel)
         irc.reply(msg, s)
 
-    def markovfollows(self, irc, msg, args):
+    def follows(self, irc, msg, args):
         """[<channel>]
 
         Returns the number of Markov's third links in the database for
@@ -204,7 +204,7 @@ class Markov(plugins.ChannelDBHandler, callbacks.Privmsg):
         s = 'There are %s follows in my Markov database for %s' % (n, channel)
         irc.reply(msg, s)
 
-    def markovlasts(self, irc, msg, args):
+    def lasts(self, irc, msg, args):
         """[<channel>]
 
         Returns the number of Markov's last links in the database for
diff --git a/test/test_Markov.py b/test/test_Markov.py
new file mode 100644
index 000000000..27c702298
--- /dev/null
+++ b/test/test_Markov.py
@@ -0,0 +1,46 @@
+#!/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 *
+
+try:
+    import sqlite
+except ImportError:
+    sqlite = None
+
+class MarkovTestCase(PluginTestCase, PluginDocumentation):
+    plugins = ('Markov',)
+    if sqlite is not None:
+        pass # Put actual tests here.
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+