diff --git a/basis/db2/debug/debug.factor b/basis/db2/debug/debug.factor
index 56c693b538..6ceca3fb45 100644
--- a/basis/db2/debug/debug.factor
+++ b/basis/db2/debug/debug.factor
@@ -47,4 +47,4 @@ IN: db2.debug
     [ postgresql-test-db ] dip with-db ; inline
 
 : with-dummy-sqlite ( quot -- )
-    [ postgresql-test-db ] dip with-db ; inline
+    [ sqlite-test-db ] dip with-db ; inline
diff --git a/basis/db2/queries/queries.factor b/basis/db2/queries/queries.factor
index cad1540fb1..6202a0e111 100644
--- a/basis/db2/queries/queries.factor
+++ b/basis/db2/queries/queries.factor
@@ -76,16 +76,19 @@ M: object database-table-columns-statement ( database table -- sequence )
 : database-tables ( database -- sequence )
     database-tables-statement >sql-objects ;
 
-: tables ( -- sequence )
+: current-tables ( -- sequence )
     current-db-name database-tables ;
 
-: database-table-names ( database -- sequence )
-    database-tables [ table-name>> ] map ;
+: table-names ( sequence -- strings )
+    [ table-name>> ] map ;
 
-: table-names ( -- sequence )
+: database-table-names ( database -- sequence )
+    database-tables table-names ;
+
+: current-table-names ( -- sequence )
     current-db-name database-table-names ;
 
-: table-exists? ( table -- ? ) table-names member? ;
+: table-exists? ( table -- ? ) current-table-names member? ;
 
 : database-table-columns ( database table -- sequence )
     database-table-columns-statement >sql-columns ;
@@ -95,3 +98,6 @@ M: object database-table-columns-statement ( database table -- sequence )
 
 : databases ( -- sequence )
     databases-statement sql-query concat ;
+
+! [ "select nspname from pg_catalog.pg_namespace" sql-query ] with-dummy-postgresql
+! [ "select schema_name from information_schema.schemata" sql-query ] with-dummy-postgresql