Index: test/lock6.test
==================================================================
--- test/lock6.test
+++ test/lock6.test
@@ -110,14 +110,14 @@
     execsql {pragma lock_status}
   } {main unlocked temp closed}
 
   sqlite3_soft_heap_limit 0
   do_test lock6-1.3 {
-    sqlite3 db test.db
-    catchsql {
-      select * from sqlite_master;
-    } 
+    list [catch {
+      sqlite3 db test.db
+      execsql { select * from sqlite_master } 
+    } msg] $msg
   } {1 {database is locked}}
 
   do_test lock6-1.4 {
     set lockpath [execsql {
       PRAGMA lock_proxy_file=":auto:";

Index: test/pragma.test
==================================================================
--- test/pragma.test
+++ test/pragma.test
@@ -1377,25 +1377,25 @@
     string match "*test2.db:auto:" $lockpath
   } {1}
   
   set sqlite_hostid_num 2
   do_test pragma-16.7 {
-    sqlite3 db test2.db
-    execsql {
-      PRAGMA lock_proxy_file=":auto:";
-    } 
-    catchsql {
-      select * from sqlite_master;
-    }
+    list [catch {
+      sqlite3 db test2.db
+      execsql { 
+        PRAGMA lock_proxy_file=":auto:";
+        select * from sqlite_master;
+      }
+    } msg] $msg
   } {1 {database is locked}}
   db close
   
   do_test pragma-16.8 {
-    sqlite3 db test2.db
-    catchsql {
-      select * from sqlite_master;
-    } 
+    list [catch {
+      sqlite3 db test2.db
+      execsql { select * from sqlite_master } 
+    } msg] $msg
   } {1 {database is locked}}
 
   db2 close
   do_test pragma-16.8.1 {
     execsql {