diff --git a/test/test.py b/test/test.py
index 669e447ae..b4302da97 100755
--- a/test/test.py
+++ b/test/test.py
@@ -175,3 +175,5 @@ if __name__ == '__main__':
     runner.run(suite)
     print 'Total asserts: %s' % unittest.asserts
     world.testing = False
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/test/test_Alias.py b/test/test_Alias.py
index 3a1f42205..33584d40e 100644
--- a/test/test_Alias.py
+++ b/test/test_Alias.py
@@ -60,3 +60,5 @@ class FunctionsTest(unittest.TestCase):
         self.assertEqual(Alias.findBiggestDollar('foo $0 $1'), 1)
         self.assertEqual(Alias.findBiggestDollar('foo $1 $3'), 3)
         self.assertEqual(Alias.findBiggestDollar('$10 bar $1'), 10)
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/test/test_FunCommands.py b/test/test_FunCommands.py
index a120e2aab..77d298609 100644
--- a/test/test_FunCommands.py
+++ b/test/test_FunCommands.py
@@ -84,3 +84,4 @@ class FunCommandsTest(PluginTestCase):
             i = ord(c)
             self.assertResponse('ord %s' % utils.dqrepr(c), str(i))
 
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/test/test_FunDB.py b/test/test_FunDB.py
new file mode 100644
index 000000000..2487485f5
--- /dev/null
+++ b/test/test_FunDB.py
@@ -0,0 +1,38 @@
+#!/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 TestFunDB(PluginTestCase):
+    pass
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+
diff --git a/test/test_Http.py b/test/test_Http.py
index f29c1883c..78451cf5a 100644
--- a/test/test_Http.py
+++ b/test/test_Http.py
@@ -60,3 +60,7 @@ class HttpTest(PluginTestCase):
 
     def testNetcraft(self):
         self.assertNotError('netcraft slashdot.org')
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+
diff --git a/test/test_Unix.py b/test/test_Unix.py
index 23d63f678..db8c4be92 100644
--- a/test/test_Unix.py
+++ b/test/test_Unix.py
@@ -40,3 +40,5 @@ class UnixTestCase(PluginTestCase):
                           'not find')
         self.assertNotError('spell Strizzike')
         self.assertError('spell foo bar baz')
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/test/test_callbacks.py b/test/test_callbacks.py
index e5a095a8b..1214e8a22 100644
--- a/test/test_callbacks.py
+++ b/test/test_callbacks.py
@@ -116,3 +116,5 @@ class FunctionsTestCase(unittest.TestCase):
         self.assertEqual(ircmsgs.privmsg(channelMsg.args[0],
                                          '%s: foo' % channelMsg.nick),
                          callbacks.reply(channelMsg, 'foo'))
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/test/test_fix.py b/test/test_fix.py
index 703b9bd26..346c9d753 100644
--- a/test/test_fix.py
+++ b/test/test_fix.py
@@ -117,3 +117,6 @@ class FunctionsTest(unittest.TestCase):
         self.assertEqual(lflatten([[[[[[[[[[]]]]]]]]]]), [])
         self.assertEqual(lflatten([1, [2, [3, 4], 5], 6]), [1, 2, 3, 4, 5, 6])
         self.assertRaises(TypeError, lflatten, 1)
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/test/test_ircdb.py b/test/test_ircdb.py
index b8031b8d3..ab2e54631 100644
--- a/test/test_ircdb.py
+++ b/test/test_ircdb.py
@@ -397,3 +397,7 @@ class CheckCapabilityTestCase(unittest.TestCase):
         self.failIf(self.checkCapability(self.antichanfoo, self.chancap))
         self.failUnless(self.checkCapability(self.antichanfoo,
                                              self.antichancap))
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+
diff --git a/test/test_irclib.py b/test/test_irclib.py
index e6b354d9b..92c44ab3a 100644
--- a/test/test_irclib.py
+++ b/test/test_irclib.py
@@ -269,3 +269,6 @@ class IrcCallbackTestCase(unittest.TestCase):
         expected.insert(0, ircmsgs.password(password))
         self.assertEqual(msgs, expected)
         conf.throttleTime = oldconfthrottle
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+
diff --git a/test/test_ircmsgs.py b/test/test_ircmsgs.py
index d397f28b4..a0e874fa0 100644
--- a/test/test_ircmsgs.py
+++ b/test/test_ircmsgs.py
@@ -154,3 +154,6 @@ class FunctionsTestCase(unittest.TestCase):
         keys.pop()
         self.assertEqual(ircmsgs.joins(channels, keys).args,
                          ('#osu,#umich', 'michiganSucks'))
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/test/test_ircutils.py b/test/test_ircutils.py
index b6941251b..8cdd5fea0 100644
--- a/test/test_ircutils.py
+++ b/test/test_ircutils.py
@@ -190,3 +190,8 @@ class IrcDictTestCase(unittest.TestCase):
         self.assertEqual(12, d['#foo'])
         d['#fOOBAR[]'] = 'blah'
         self.assertEqual('blah', d['#foobar{}'])
+
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+
diff --git a/test/test_privmsgs.py b/test/test_privmsgs.py
index 1638ca126..6d11d73cc 100644
--- a/test/test_privmsgs.py
+++ b/test/test_privmsgs.py
@@ -61,3 +61,7 @@ class FunctionsTest(unittest.TestCase):
                          args + [''])
         self.assertEqual(privmsgs.getArgs(args, needed=0, optional=1),
                          ' '.join(args))
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+
diff --git a/test/test_schedule.py b/test/test_schedule.py
index cf467371a..af00f0300 100644
--- a/test/test_schedule.py
+++ b/test/test_schedule.py
@@ -66,3 +66,5 @@ class TestSchedule(unittest.TestCase):
         
 
         
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+
diff --git a/test/test_structures.py b/test/test_structures.py
index ece0c57e4..ec2b6ebff 100644
--- a/test/test_structures.py
+++ b/test/test_structures.py
@@ -376,3 +376,6 @@ class MaxLengthQueueTestCase(unittest.TestCase):
         self.assertEqual(len(q), 3)
         self.assertEqual(q[0], 3)
 
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+