diff --git a/plugins/quote.py b/plugins/quote.py
index 9fd171b..ec9925d 100644
--- a/plugins/quote.py
+++ b/plugins/quote.py
@@ -1,6 +1,7 @@
 import random
 import re
 import time
+import unittest
 
 from util import hook
 
@@ -35,6 +36,11 @@ def get_quotes_by_chan(db, chan):
                       "and chan=? order by time", (chan,)).fetchall()
 
 
+def get_quote_by_id(db, num):
+    return db.execute("select time, nick, msg from quote where deleted!=1 "
+                      "and rowid=?", (num,)).fetchall()
+
+
 def format_quote(q, num, n_quotes):
     ctime, nick, msg = q
     return "[%d/%d] %s <%s> %s" % (num, n_quotes,
@@ -57,6 +63,7 @@ def quote(inp, nick='', chan='', db=None, admin=False):
     delete = re.match(r"delete[^\w@]+(\S+?)>?\s+(.*)", inp, re.I)
     retrieve = re.match(r"(\S+)(?:\s+#?(-?\d+))?$", inp)
     retrieve_chan = re.match(r"(#\S+)\s+(\S+)(?:\s+#?(-?\d+))?$", inp)
+    retrieve_id = re.match(r"(\d+)$", inp)
 
     if add:
         quoted_nick, msg = add.groups()
@@ -74,9 +81,12 @@ def quote(inp, nick='', chan='', db=None, admin=False):
             return "deleted quote '%s'" % msg
         else:
             return "found no matching quotes to delete"
+    elif retrieve_id:
+        quote_id, = retrieve_id.groups()
+        num = 1
+        quotes = get_quote_by_id(db, quote_id)
     elif retrieve:
         select, num = retrieve.groups()
-
         if select.startswith('#'):
             quotes = get_quotes_by_chan(db, select)
         else:
@@ -88,14 +98,14 @@ def quote(inp, nick='', chan='', db=None, admin=False):
     else:
         return quote.__doc__
 
+    if num:
+        num = int(num)
+
     n_quotes = len(quotes)
 
     if not n_quotes:
         return "no quotes found"
 
-    if num:
-        num = int(num)
-
     if num:
         if num > n_quotes or (num < 0 and num < -n_quotes):
             return "I only have %d quote%s for %s" % (n_quotes,
@@ -110,3 +120,74 @@ def quote(inp, nick='', chan='', db=None, admin=False):
         selected_quote = quotes[num - 1]
 
     return format_quote(selected_quote, num, n_quotes)
+
+
+class QuoteTest(unittest.TestCase):
+    def setUp(self):
+        import sqlite3
+        self.db = sqlite3.connect(':memory:')
+
+        quote('', db=self.db)  # init DB
+
+    def quote(self, arg, **kwargs):
+        return quote(arg, chan='#test', nick='alice', db=self.db, **kwargs)
+
+    def add_quote(self, msg=''):
+        add_quote(self.db, '#test', 'Socrates', 'Plato',
+                  msg or 'Education is the kindling of a flame,'
+                  ' not the filling of a vessel.')
+
+    def test_retrieve_chan(self):
+        self.add_quote()
+        assert '<Socrates> Education' in self.quote('#test')
+
+    def test_retrieve_user(self):
+        self.add_quote()
+        assert '<Socrates> Education' in self.quote('socrates')
+
+    def test_no_quotes(self):
+        assert "no quotes found" in self.quote("#notachan")
+
+    def test_quote_too_high(self):
+        self.add_quote()
+        assert 'I only have 1 quote for #test' in self.quote('#test 4')
+
+    def test_add(self):
+        self.quote("add <someone> witty phrase")
+        assert 'witty' in self.quote('#test')
+
+    def test_add_twice(self):
+        self.quote("add <someone> lol")
+        assert 'already stored' in self.quote("add <someone> lol")
+
+    def test_del_not_admin(self):
+        assert 'only admins' in self.quote('delete whoever 4')
+
+    def test_del_not_exists(self):
+        assert 'found no matching' in self.quote(
+            'delete whoever 4', admin=True)
+
+    def test_del(self):
+        self.add_quote("hi")
+        assert "deleted quote 'hi'" in self.quote(
+            'delete socrates hi', admin=True)
+
+    def test_retrieve_id(self):
+        self.add_quote()
+        assert 'Education is' in self.quote('1')
+
+    def test_retrieve_chan_user(self):
+        self.add_quote()
+        assert 'Education' in self.quote('#test socrates')
+        assert 'Education' in self.quote('#test socrates 1')
+
+    def test_nth(self):
+        self.add_quote('first quote')
+        self.add_quote('second quote')
+        self.add_quote('third quote')
+        self.add_quote('fourth quote')
+        assert 'third' in self.quote('socrates -2')
+        assert 'only have 4' in self.quote('socrates -9')
+
+if __name__ == '__main__':
+    unittest.main()