diff --git a/Lib/test/test_al.py b/Lib/test/test_al.py
index 4f86f39..d11c7e5 100755
--- a/Lib/test/test_al.py
+++ b/Lib/test/test_al.py
@@ -3,7 +3,7 @@
    Roger E. Masse
 """
 import al
-from test_support import verify, verbose
+from test_support import verbose
 
 alattrs = ['__doc__', '__name__', 'getdefault', 'getminmax', 'getname', 'getparams',
            'newconfig', 'openport', 'queryparams', 'setparams']
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
index a20b870..087e65b 100755
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -3,7 +3,7 @@
    Roger E. Masse
 """
 import array
-from test_support import verify, verbose, TESTFN, unlink, TestFailed
+from test_support import verbose, TESTFN, unlink, TestFailed
 
 def main():
 
diff --git a/Lib/test/test_atexit.py b/Lib/test/test_atexit.py
index f76f110..517610b 100644
--- a/Lib/test/test_atexit.py
+++ b/Lib/test/test_atexit.py
@@ -1,5 +1,5 @@
 # Test the exit module
-from test_support import verify, verbose
+from test_support import verbose
 import atexit
 
 def handler1():
diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py
index f74242d..495a918 100644
--- a/Lib/test/test_audioop.py
+++ b/Lib/test/test_audioop.py
@@ -1,6 +1,6 @@
 # Test audioop.
 import audioop
-from test_support import verify, verbose
+from test_support import verbose
 
 def gendata1():
     return '\0\1\2'
diff --git a/Lib/test/test_binhex.py b/Lib/test/test_binhex.py
index 4cee4fb..a2b2a2c 100755
--- a/Lib/test/test_binhex.py
+++ b/Lib/test/test_binhex.py
@@ -6,7 +6,7 @@
 """
 import binhex
 import tempfile
-from test_support import verify, verbose, TestSkipped
+from test_support import verbose, TestSkipped
 
 def test():
 
diff --git a/Lib/test/test_bsddb.py b/Lib/test/test_bsddb.py
index e559b20..b59a4e0 100755
--- a/Lib/test/test_bsddb.py
+++ b/Lib/test/test_bsddb.py
@@ -6,7 +6,7 @@
 import os
 import bsddb
 import tempfile
-from test_support import verify, verbose
+from test_support import verbose
 
 def test(openmethod, what):
 
diff --git a/Lib/test/test_bufio.py b/Lib/test/test_bufio.py
index e4467fe..12359c4 100644
--- a/Lib/test/test_bufio.py
+++ b/Lib/test/test_bufio.py
@@ -1,4 +1,4 @@
-from test_support import TestFailed, TESTFN, verify
+from test_support import verify, TestFailed, TESTFN
 
 # Simple test to ensure that optimizations in fileobject.c deliver
 # the expected results.  For best testing, run this under a debug-build
diff --git a/Lib/test/test_cd.py b/Lib/test/test_cd.py
index 7af2e0b..9a45a7d 100755
--- a/Lib/test/test_cd.py
+++ b/Lib/test/test_cd.py
@@ -3,7 +3,7 @@
    Roger E. Masse
 """
 import cd
-from test_support import verify, verbose
+from test_support import verbose
 
 cdattrs = ['BLOCKSIZE', 'CDROM', 'DATASIZE', 'ERROR', 'NODISC', 'PAUSED', 'PLAYING', 'READY',
            'STILL', '__doc__', '__name__', 'atime', 'audio', 'catalog', 'control', 'createparser', 'error',
diff --git a/Lib/test/test_cl.py b/Lib/test/test_cl.py
index f8112eb..26c5146 100755
--- a/Lib/test/test_cl.py
+++ b/Lib/test/test_cl.py
@@ -3,7 +3,7 @@
    Roger E. Masse
 """
 import cl
-from test_support import verify, verbose
+from test_support import verbose
 
 clattrs = ['ADDED_ALGORITHM_ERROR', 'ALAW', 'ALGORITHM_ID',
 'ALGORITHM_VERSION', 'AUDIO', 'AWARE_ERROR', 'AWARE_MPEG_AUDIO',
diff --git a/Lib/test/test_cmath.py b/Lib/test/test_cmath.py
index 9caa216..509c739 100755
--- a/Lib/test/test_cmath.py
+++ b/Lib/test/test_cmath.py
@@ -3,7 +3,7 @@
     Roger E. Masse
 """
 import cmath
-from test_support import verify, verbose
+from test_support import verbose
 
 testdict = {'acos' : 1.0,
             'acosh' : 1.0,
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index fa608b1..8905864 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose, TestFailed
+from test_support import verbose, TestFailed
 
 if verbose:
     print 'Running test on duplicate arguments'
diff --git a/Lib/test/test_cookie.py b/Lib/test/test_cookie.py
index 414de31..87d0521 100644
--- a/Lib/test/test_cookie.py
+++ b/Lib/test/test_cookie.py
@@ -2,6 +2,7 @@
 
 from test_support import verify
 import Cookie
+from test_support import verify, verbose
 
 # Currently this only tests SimpleCookie
 
diff --git a/Lib/test/test_dbm.py b/Lib/test/test_dbm.py
index 6510125..94949cf 100755
--- a/Lib/test/test_dbm.py
+++ b/Lib/test/test_dbm.py
@@ -4,7 +4,7 @@
 """
 import dbm
 from dbm import error
-from test_support import verify, verbose
+from test_support import verbose
 
 filename = '/tmp/delete_me'
 
diff --git a/Lib/test/test_dl.py b/Lib/test/test_dl.py
index c5b3bb4..60a5cf0 100755
--- a/Lib/test/test_dl.py
+++ b/Lib/test/test_dl.py
@@ -4,7 +4,7 @@
 """
 
 import dl
-from test_support import verify, verbose,TestSkipped
+from test_support import verbose,TestSkipped
 
 sharedlibs = [
     ('/usr/lib/libc.so', 'getpid'),
diff --git a/Lib/test/test_errno.py b/Lib/test/test_errno.py
index 2fb6b34..cb1e729 100755
--- a/Lib/test/test_errno.py
+++ b/Lib/test/test_errno.py
@@ -4,7 +4,7 @@
 """
 
 import errno
-from test_support import verify, verbose
+from test_support import verbose
 
 errors = ['E2BIG', 'EACCES', 'EADDRINUSE', 'EADDRNOTAVAIL', 'EADV',
           'EAFNOSUPPORT', 'EAGAIN', 'EALREADY', 'EBADE', 'EBADF',
diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py
index 5b6c5ec..b727cc7 100644
--- a/Lib/test/test_extcall.py
+++ b/Lib/test/test_extcall.py
@@ -1,6 +1,5 @@
-from test_support import verify, verbose
+from test_support import verify, verbose, TestFailed
 from UserList import UserList
-from test_support import TestFailed
 import string
 
 def f(*a, **k):
diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py
index a598a41..b6d4dfa 100755
--- a/Lib/test/test_fcntl.py
+++ b/Lib/test/test_fcntl.py
@@ -6,7 +6,7 @@
 import fcntl
 import FCNTL
 import os, sys
-from test_support import verify, verbose, TESTFN
+from test_support import verbose, TESTFN
 
 filename = TESTFN
 
diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py
index a85c9f5..c57917f 100644
--- a/Lib/test/test_format.py
+++ b/Lib/test/test_format.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import string, sys
 
 # test string formatting operator (I am not sure if this is being tested
@@ -184,7 +184,7 @@
         testformat(formatstr, args)
     except exception, exc:
         if str(exc) == excmsg:
-            if verbose: 
+            if verbose:
                 print "yes"
         else:
             if verbose: print 'no'
diff --git a/Lib/test/test_gdbm.py b/Lib/test/test_gdbm.py
index dfd05b7..67c67eb 100755
--- a/Lib/test/test_gdbm.py
+++ b/Lib/test/test_gdbm.py
@@ -5,7 +5,7 @@
 
 import gdbm
 from gdbm import error
-from test_support import verify, verbose, TestFailed
+from test_support import verbose, TestFailed
 
 filename= '/tmp/delete_me'
 
diff --git a/Lib/test/test_gl.py b/Lib/test/test_gl.py
index 72b0895..61eaa83 100755
--- a/Lib/test/test_gl.py
+++ b/Lib/test/test_gl.py
@@ -3,7 +3,7 @@
     taken mostly from the documentation.
     Roger E. Masse
 """
-from test_support import verify, verbose, TestSkipped
+from test_support import verbose, TestSkipped
 import gl, GL, time
 
 glattrs = ['RGBcolor', 'RGBcursor', 'RGBmode', 'RGBrange', 'RGBwritemask',
diff --git a/Lib/test/test_grp.py b/Lib/test/test_grp.py
index eda39d5..b737da9 100755
--- a/Lib/test/test_grp.py
+++ b/Lib/test/test_grp.py
@@ -4,7 +4,7 @@
 """
 
 import grp
-from test_support import verify, verbose
+from test_support import verbose
 
 groups = grp.getgrall()
 if verbose:
diff --git a/Lib/test/test_imageop.py b/Lib/test/test_imageop.py
index 3a63e3c..7a6981e 100755
--- a/Lib/test/test_imageop.py
+++ b/Lib/test/test_imageop.py
@@ -5,7 +5,7 @@
    Roger E. Masse
 """
 
-from test_support import verify, verbose, unlink
+from test_support import verbose, unlink
 
 import imageop, uu
 
diff --git a/Lib/test/test_imgfile.py b/Lib/test/test_imgfile.py
index 5606bb0..8eb330d 100755
--- a/Lib/test/test_imgfile.py
+++ b/Lib/test/test_imgfile.py
@@ -4,7 +4,7 @@
    Roger E. Masse
 """
 
-from test_support import verify, verbose, unlink, findfile
+from test_support import verbose, unlink, findfile
 
 import imgfile, uu, os
 
diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
index 72f3e40..e41cf8b 100644
--- a/Lib/test/test_minidom.py
+++ b/Lib/test/test_minidom.py
@@ -7,7 +7,7 @@
 import os.path
 import sys
 import traceback
-from test_support import verify, verbose
+from test_support import verbose
 
 if __name__ == "__main__":
     base = sys.argv[0]
@@ -81,7 +81,7 @@
     dom = Document()
     elem = dom.createElement('element')
     text = dom.createTextNode('text')
-    
+
     try: dom.appendChild(text)
     except HierarchyRequestErr: pass
     else:
@@ -99,7 +99,7 @@
         print "dom.appendChild didn't raise HierarchyRequestErr"
 
     elem.appendChild(text)
-    dom.unlink() 
+    dom.unlink()
 
 def testNonZero():
     dom = parse(tstfile)
@@ -395,7 +395,7 @@
                 , "clone of attribute node has proper attribute values")
         confirm(a2.ownerElement is e2,
                 "clone of attribute node correctly owned")
-    
+
 
 def testCloneDocumentShallow(): pass
 
diff --git a/Lib/test/test_new.py b/Lib/test/test_new.py
index 929155c..70ea38b 100644
--- a/Lib/test/test_new.py
+++ b/Lib/test/test_new.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import sys
 import new
 
diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py
index 56382c5..e1670d1 100644
--- a/Lib/test/test_nis.py
+++ b/Lib/test/test_nis.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose, TestFailed, TestSkipped
+from test_support import verbose, TestFailed, TestSkipped
 import nis
 
 print 'nis.maps()'
diff --git a/Lib/test/test_openpty.py b/Lib/test/test_openpty.py
index cd0191f..fb81719 100644
--- a/Lib/test/test_openpty.py
+++ b/Lib/test/test_openpty.py
@@ -1,7 +1,7 @@
 # Test to see if openpty works. (But don't worry if it isn't available.)
 
 import os
-from test_support import verify, verbose, TestFailed, TestSkipped
+from test_support import verbose, TestFailed, TestSkipped
 
 try:
     if verbose:
diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
index 891855a..6885767 100644
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -3,7 +3,7 @@
 import pprint
 import sys
 
-from test_support import verify, TestFailed
+from test_support import TestFailed
 
 #
 #  First, we test that we can generate trees from valid source fragments,
diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index 0354312..5ea7e6f 100644
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -1,5 +1,5 @@
 import pty, os, sys, string
-from test_support import verify, verbose, TestFailed, TestSkipped
+from test_support import verbose, TestFailed, TestSkipped
 
 TEST_STRING_1 = "I wish to buy a fish license."
 TEST_STRING_2 = "For my pet fish, Eric."
diff --git a/Lib/test/test_pwd.py b/Lib/test/test_pwd.py
index d179ed0..7425f53 100644
--- a/Lib/test/test_pwd.py
+++ b/Lib/test/test_pwd.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import pwd
 import string
 
diff --git a/Lib/test/test_regex.py b/Lib/test/test_regex.py
index a49abea..a324821 100644
--- a/Lib/test/test_regex.py
+++ b/Lib/test/test_regex.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import warnings
 warnings.filterwarnings("ignore", "the regex module is deprecated",
                         DeprecationWarning, __name__)
diff --git a/Lib/test/test_rfc822.py b/Lib/test/test_rfc822.py
index c6df925..967b91b 100644
--- a/Lib/test/test_rfc822.py
+++ b/Lib/test/test_rfc822.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import rfc822, sys
 try:
     from cStringIO import StringIO
diff --git a/Lib/test/test_rgbimg.py b/Lib/test/test_rgbimg.py
index b078d47..f2622e4 100644
--- a/Lib/test/test_rgbimg.py
+++ b/Lib/test/test_rgbimg.py
@@ -2,7 +2,7 @@
 
 import rgbimg, os, uu
 
-from test_support import verify, verbose, unlink, findfile
+from test_support import verbose, unlink, findfile
 
 class error(Exception):
     pass
diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
index be12923..d5bcfd5 100644
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -1,5 +1,5 @@
 # Testing select module
-from test_support import verify, verbose
+from test_support import verbose
 import select
 import os
 
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 9d4c277..a6c32b4 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -1,5 +1,5 @@
 # Test the signal module
-from test_support import verify, verbose, TestSkipped
+from test_support import verbose, TestSkipped
 import signal
 import os
 import sys
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index dab432f..fe37936 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -8,7 +8,7 @@
 #       sktobj.shutdown()
 
 
-from test_support import verify, verbose, TestFailed
+from test_support import verbose, TestFailed
 import socket
 import os
 import time
diff --git a/Lib/test/test_sre.py b/Lib/test/test_sre.py
index 0aa8349..88c0d62 100644
--- a/Lib/test/test_sre.py
+++ b/Lib/test/test_sre.py
@@ -6,7 +6,7 @@
 import sys
 sys.path=['.']+sys.path
 
-from test_support import verify, verbose, TestFailed
+from test_support import verbose, TestFailed
 import sre
 import sys, os, string, traceback
 
diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index 73de2d3..7f5cb80 100755
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -3,7 +3,7 @@
 # Sanity checker for time.strftime
 
 import time, calendar, sys, string, os, re
-from test_support import verify, verbose
+from test_support import verbose
 
 def main():
     global verbose
diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py
index fd1cbae..3574719 100644
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose, TestSkipped
+from test_support import verbose, TestSkipped
 import string_tests
 import string, sys
 
diff --git a/Lib/test/test_strop.py b/Lib/test/test_strop.py
index d444f3d..5770046 100644
--- a/Lib/test/test_strop.py
+++ b/Lib/test/test_strop.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import strop, sys
 
 def test(name, input, output, *args):
diff --git a/Lib/test/test_sunaudiodev.py b/Lib/test/test_sunaudiodev.py
index 4083c68..af18761 100644
--- a/Lib/test/test_sunaudiodev.py
+++ b/Lib/test/test_sunaudiodev.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose, findfile, TestFailed
+from test_support import verbose, findfile, TestFailed
 import sunaudiodev
 import os
 
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 134badf..02da94e 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -2,7 +2,7 @@
 
 # Create a bunch of threads, let each do some work, wait until all are done
 
-from test_support import verify, verbose
+from test_support import verbose
 import random
 import thread
 import time
diff --git a/Lib/test/test_timing.py b/Lib/test/test_timing.py
index 984638e..5dbc895 100644
--- a/Lib/test/test_timing.py
+++ b/Lib/test/test_timing.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose
+from test_support import verbose
 import timing
 
 r = range(100000)
diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 52d4300..a0713d1 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1,4 +1,4 @@
-from test_support import verify, verbose, findfile
+from test_support import verbose, findfile
 import tokenize, os, sys
 
 if verbose:
diff --git a/Lib/test/test_userlist.py b/Lib/test/test_userlist.py
index da866cc..e655d1f 100644
--- a/Lib/test/test_userlist.py
+++ b/Lib/test/test_userlist.py
@@ -3,8 +3,9 @@
 from UserList import UserList
 from test_support import TestFailed
 
-# Use check instead of verify(so -O doesn't render the)
+# Use check instead of assert so -O doesn't render the
 # test useless.
+# XXX: could use the verify function in test_support instead
 def check(predicate, msg):
     if not predicate:
         raise TestFailed(msg + " failed")
diff --git a/Lib/test/test_userstring.py b/Lib/test/test_userstring.py
index 4f54db2..a47bfdd 100755
--- a/Lib/test/test_userstring.py
+++ b/Lib/test/test_userstring.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import sys, string
-from test_support import verify, verbose
+from test_support import verbose
 import string_tests
 # UserString is a wrapper around the native builtin string type.
 # UserString instances should behave similar to builtin string objects.
diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py
index 20df7de..02bc749 100644
--- a/Lib/test/test_winreg.py
+++ b/Lib/test/test_winreg.py
@@ -4,6 +4,8 @@
 from _winreg import *
 import os, sys
 
+from test_support import verify
+
 test_key_name = "SOFTWARE\\Python Registry Test Key - Delete Me"
 
 test_data = [
diff --git a/Lib/test/test_xmllib.py b/Lib/test/test_xmllib.py
index 32f6b85..62803b5 100644
--- a/Lib/test/test_xmllib.py
+++ b/Lib/test/test_xmllib.py
@@ -2,7 +2,7 @@
    Sjoerd Mullender
 '''
 
-from test_support import verify, verbose
+from test_support import verbose
 
 testdoc = """\
 <?xml version="1.0" encoding="UTF-8" standalone='yes' ?>