diff -r 379372612f6d Lib/test/test_sundry.py
--- a/Lib/test/test_sundry.py	Fri Oct 25 00:08:13 2013 +0300
+++ b/Lib/test/test_sundry.py	Thu Oct 24 18:56:05 2013 -0400
@@ -7,7 +7,7 @@
 class TestUntestedModules(unittest.TestCase):
     def test_untested_modules_can_be_imported(self):
         untested = ('bdb', 'encodings', 'formatter', 'imghdr',
-                    'nturl2path', 'tabnanny')
+                    'nturl2path')
         with support.check_warnings(quiet=True):
             for name in untested:
                 try:
diff -r 379372612f6d Lib/test/test_tabnanny.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Lib/test/test_tabnanny.py	Thu Oct 24 18:56:05 2013 -0400
@@ -0,0 +1,57 @@
+import tabnanny
+from unittest import TestCase, main
+import tempfile
+import tokenize
+
+class MainTestCase(TestCase):
+    def test_check(self):
+        tempdir = tempfile.mkdtemp()
+        subfile = open(tempdir + "/foo.py", "w")
+        subfile.close()
+        tabnanny.check(tempdir)
+
+    def test_format_witnesses(self):
+        self.assertEqual("at tab sizes 0, 1", tabnanny.format_witnesses([(0, 0, 0), (1, 1, 1)]))
+
+    def test_process_tokens(self):
+        tabnanny.process_tokens([
+            (tokenize.NEWLINE, "", "", "", ""),
+            (tokenize.INDENT, " ", "", "", ""),
+            (tokenize.DEDENT, "", "", "", ""),
+        ])
+        self.assertRaises(tabnanny.NannyNag, tabnanny.process_tokens, [
+            (tokenize.INDENT, "", " ", "", "")
+        ])
+        self.assertRaises(tabnanny.NannyNag, tabnanny.process_tokens, [
+            (tokenize.NEWLINE, "", "", "", ""),
+            (tokenize.STRING, "", " ", "", " "),
+        ])
+
+class NannyNagTestCase(TestCase):
+    def test_nannynag(self):
+        nag = tabnanny.NannyNag(0, "foo", "bar")
+        self.assertEqual(0, nag.get_lineno())
+        self.assertEqual("foo", nag.get_msg())
+        self.assertEqual("bar", nag.get_line())
+
+class WhitespaceTestCase(TestCase):
+    def setUp(self):
+        self.whitespace = tabnanny.Whitespace(" \tf")
+
+    def test_calculation(self):
+        self.assertEqual(1, self.whitespace.longest_run_of_spaces())
+        self.assertEqual(2, self.whitespace.indent_level(1))
+
+    def test_equality(self):
+        self.assertTrue(self.whitespace.equal(self.whitespace))
+        self.assertEqual([(3, 3, 2)], self.whitespace.not_equal_witness(tabnanny.Whitespace("  f")))
+
+    def test_less(self):
+        self.assertFalse(self.whitespace.less(self.whitespace))
+        self.assertTrue(tabnanny.Whitespace("").less(tabnanny.Whitespace(" ")))
+        self.assertTrue(tabnanny.Whitespace("\t").less(tabnanny.Whitespace(" \t ")))
+        self.assertFalse(tabnanny.Whitespace("\t ").less(tabnanny.Whitespace(" \t ")))
+        self.assertEqual([(1, 2, 2), (2, 2, 2)], self.whitespace.not_less_witness(self.whitespace))
+
+if __name__ == "__main__":
+    main()