diff --git a/drivers/pgsql/pgsql_sql.php b/drivers/pgsql/pgsql_sql.php
index 89dbb69..124b76a 100644
--- a/drivers/pgsql/pgsql_sql.php
+++ b/drivers/pgsql/pgsql_sql.php
@@ -173,10 +173,11 @@ SQL;
 	public function table_list()
 	{
 		return <<<SQL
-			SELECT "tablename" FROM "pg_tables"
-			WHERE "tablename" NOT LIKE 'pg_%'
-			AND "tablename" NOT LIKE 'sql_%'
-			ORDER BY "tablename" ASC
+			SELECT "table_name"
+  			FROM "information_schema"."tables"
+ 			WHERE "table_type" = 'BASE TABLE'
+   			AND "table_schema" NOT IN
+       			('pg_catalog', 'information_schema');
 SQL;
 	}
 
@@ -191,7 +192,7 @@ SQL;
 	{
 		return <<<SQL
 		 	SELECT "tablename" FROM "pg_tables"
-			WHERE "tablename" LIKE 'pg\_%'
+			WHERE "tablename" ~ '^(pg_|sql_)'
 SQL;
 	}
 
diff --git a/tests/db_files/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB
index d1440b4..9455f7c 100644
Binary files a/tests/db_files/FB_TEST_DB.FDB and b/tests/db_files/FB_TEST_DB.FDB differ