Index: test/lock2.test
==================================================================
--- test/lock2.test
+++ test/lock2.test
@@ -57,13 +57,12 @@
     }
   }
 } {}
 do_test lock2-1.4 {
   testfixture $::tf1 {
-    db eval {
-      CREATE TABLE def(d, e, f)
-    }
+    catch { db eval { CREATE TABLE def(d, e, f) } } msg
+    set msg
   }
 } {database is locked}
 do_test lock2-1.5 {
   catchsql {
     COMMIT;
@@ -77,14 +76,15 @@
     }
   }
 } {}
 do_test lock2-1.7 {
   testfixture $::tf1 {
-    db eval {
+    catch { db eval {
       BEGIN;
       SELECT * FROM sqlite_master;
-    }
+    } } msg 
+    set msg
   }
 } {database is locked}
 do_test lock2-1.8 {
   catchsql {
     COMMIT;

Index: test/permutations.test
==================================================================
--- test/permutations.test
+++ test/permutations.test
@@ -22,19 +22,20 @@
 #       -description TITLE                  (default "")
 #       -initialize  SCRIPT                 (default "")
 #       -shutdown    SCRIPT                 (default "")
 #       -presql      SQL                    (default "")
 #       -files       LIST-OF-FILES          (default $::ALLTESTS)
-#
+#       -prefix      NAME                   (default "$::NAME.")
 #
 proc test_suite {name args} {
 
   set default(-shutdown)    ""
   set default(-initialize)  ""
   set default(-presql)      ""
   set default(-description) "no description supplied (fixme)"
-  set default(-files)     ""
+  set default(-files)       ""
+  set default(-prefix)      "${name}."
 
   array set options [array get default]
   if {[llength $args]%2} {
     error "uneven number of options/switches passed to test_suite"
   }
@@ -77,13 +78,12 @@
 #-------------------------------------------------------------------------
 # Set up the following global list variables containing the names of 
 # various test scripts:
 #
 #   $alltests
-#   $slowtests
+#   $allquicktests
 #
-
 set alltests [list]
 foreach f [glob $testdir/*.test] { lappend alltests [file tail $f] }
 if {$::tcl_platform(platform)!="unix"} {
   set alltests [test_set $alltests -exclude crash.test crash2.test]
 }
@@ -120,32 +120,32 @@
 #   full
 #   veryquick_plus_notify2
 #
 lappend ::testsuitelist xxx
 
-test_suite "veryquick" -description {
+test_suite "veryquick" -prefix "" -description {
   "Very" quick test suite. Runs in less than 5 minutes on a workstation. 
   This test suite is the same as the "quick" tests, except that some files
   that test malloc and IO errors are omitted.
 } -files [
   test_set $allquicktests -exclude *malloc* *ioerr* *fault*
 ]
 
-test_suite "quick" -description {
+test_suite "quick" -prefix "" -description {
   Quick test suite. Runs in around 10 minutes on a workstation.
 } -files [
   test_set $allquicktests
 ]
 
-test_suite "veryquick_plus_notify2" -description {
+test_suite "veryquick_plus_notify2" -prefix "" -description {
   Very quick test suite + file notify2.test. This is used by one of the 
   sqlite.org release test configurations.
 } -files [ 
   test_set $allquicktests notify2.test -exclude *malloc* *ioerr* *fault*
 ]
 
-test_suite "full" -description {
+test_suite "full" -prefix "" -description {
   Full test suite. Takes a long time.
 } -files [ 
   test_set $alltests 
 ] -initialize {
   unset -nocomplain ::G(isquick)
@@ -775,20 +775,21 @@
 
 # run_tests NAME OPTIONS
 #
 # where available options are:  
 #
-#       -description TITLE                  (default "")
-#       -initialize  SCRIPT                 (default "")
-#       -shutdown    SCRIPT                 (default "")
-#       -presql      SQL                    (default "")
-#       -files       LIST-OF-FILES          (default "")
+#       -description TITLE
+#       -initialize  SCRIPT
+#       -shutdown    SCRIPT
+#       -presql      SQL
+#       -files       LIST-OF-FILES
+#       -prefix      NAME
 #
 proc run_tests {name args} {
   array set options $args
 
-  set ::G(perm:name)         $name
+  set ::G(perm:name)         $options(-prefix)
   set ::G(perm:presql)       $options(-presql)
   set ::G(isquick)           1
 
   uplevel $options(-initialize)
 

Index: test/tester.tcl
==================================================================
--- test/tester.tcl
+++ test/tester.tcl
@@ -297,11 +297,11 @@
     }
   }
   if {!$go} return
 
   if {[info exists ::G(perm:name)]} {
-    set name "$::G(perm:name).$name"
+    set name "$::G(perm:name)$name"
   }
 
   incr_ntest
   puts -nonewline $name...
   flush stdout