Index: utils.py
===================================================================
--- utils.py	(revision 5582)
+++ utils.py	(working copy)
@@ -123,8 +123,8 @@
         except Exception, e:            
             sys.stderr.write("Got an error creating the test database: %s\n" % e)
             if not autoclobber:
-                confirm = raw_input("It appears the test database, %s, already exists. Type 'yes' to delete it, or 'no' to cancel: " % TEST_DATABASE_NAME)
-            if autoclobber or confirm == 'yes':
+                confirm = raw_input("Type 'delete' to drop the test database (%s), or anything else to cancel: " % TEST_DATABASE_NAME)
+            if autoclobber or confirm == 'delete':
                 try:
                     if verbosity >= 1:
                         print "Destroying old test database..."