diff -r 5e45dfc421e4 Lib/test/test_cgitb.py
--- a/Lib/test/test_cgitb.py	Sat Nov 19 16:27:22 2011 +0000
+++ b/Lib/test/test_cgitb.py	Sat Nov 19 13:18:47 2011 -0500
@@ -37,16 +37,24 @@
             self.assertIn("Hello World", text)
 
     def test_hook(self):
-        proc = subprocess.Popen([sys.executable, '-c',
+        # Run twice. First we check for standard usage. Next, we ensure
+        # that running with formating set to "text" strips HTML.
+        enable_flags = ('', 'format="text"')
+        for flag in enable_flags:
+           proc = subprocess.Popen([sys.executable, '-c',
                                  ('import cgitb;'
-                                  'cgitb.enable();'
-                                  'raise ValueError("Hello World")')],
+                                  'cgitb.enable(%s);'
+                                  'raise ValueError("Hello World")' % flag)],
                                 stdout=subprocess.PIPE)
-        out = proc.stdout.read().decode(sys.getfilesystemencoding())
-        self.addCleanup(proc.stdout.close)
-        self.assertIn("ValueError", out)
-        self.assertIn("Hello World", out)
+           out = proc.stdout.read().decode(sys.getfilesystemencoding())
+           self.addCleanup(proc.stdout.close)
+           self.assertIn("ValueError", out)
+           self.assertIn("Hello World", out)
 
+           if flag:
+               self.assertNotIn('<p>', out)
+           else:
+               self.assertIn('<p>', out)
 
 def test_main():
     run_unittest(TestCgitb)