diff --git a/drivers/pgsql/pgsql_sql.php b/drivers/pgsql/pgsql_sql.php
index 124b76a..b7254ec 100644
--- a/drivers/pgsql/pgsql_sql.php
+++ b/drivers/pgsql/pgsql_sql.php
@@ -174,10 +174,10 @@ SQL;
 	{
 		return <<<SQL
 			SELECT "table_name"
-  			FROM "information_schema"."tables"
- 			WHERE "table_type" = 'BASE TABLE'
-   			AND "table_schema" NOT IN
-       			('pg_catalog', 'information_schema');
+			FROM "information_schema"."tables"
+			WHERE "table_type" = 'BASE TABLE'
+			AND "table_schema" NOT IN
+				('pg_catalog', 'information_schema');
 SQL;
 	}
 
@@ -191,8 +191,11 @@ SQL;
 	public function system_table_list()
 	{
 		return <<<SQL
-		 	SELECT "tablename" FROM "pg_tables"
-			WHERE "tablename" ~ '^(pg_|sql_)'
+			SELECT "table_name"
+			FROM "information_schema"."tables"
+			WHERE "table_type" = 'BASE TABLE'
+			AND "table_schema" IN
+				('pg_catalog', 'information_schema');
 SQL;
 	}
 
diff --git a/tests/db_files/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB
index 9455f7c..3f49ff6 100644
Binary files a/tests/db_files/FB_TEST_DB.FDB and b/tests/db_files/FB_TEST_DB.FDB differ