diff --git a/e2e_test/batch/catalog/pg_namespace.slt.part b/e2e_test/batch/catalog/pg_namespace.slt.part
index 3ea9fd4141484..4218ca76cba6a 100644
--- a/e2e_test/batch/catalog/pg_namespace.slt.part
+++ b/e2e_test/batch/catalog/pg_namespace.slt.part
@@ -4,4 +4,43 @@ SELECT nspname FROM pg_catalog.pg_namespace;
 information_schema
 pg_catalog
 public
-rw_catalog
\ No newline at end of file
+rw_catalog
+
+query TT rowsort
+SELECT
+	nspname AS schema_name,
+	pg_catalog.obj_description(oid) AS comment
+FROM
+    pg_catalog.pg_namespace
+WHERE
+    nspname NOT IN ('information_schema', 'pg_catalog', 'pg_toast', 'crdb_internal', 'pg_extension')
+    AND nspname NOT LIKE 'pg_%temp_%'
+ORDER BY
+    nspname;
+----
+public (empty)
+rw_catalog (empty)
+
+query TTTTTTT
+SELECT
+	t3.oid,
+	t1.table_schema,
+	t1.table_name,
+	pg_catalog.obj_description(t3.oid, 'pg_class') AS comment,
+	t4.partattrs AS partition_attrs,
+	t4.partstrat AS partition_strategy,
+	pg_get_expr(t4.partexprs, t4.partrelid) AS partition_exprs
+FROM
+	INFORMATION_SCHEMA.TABLES AS t1
+	JOIN pg_catalog.pg_namespace AS t2 ON t2.nspname = t1.table_schema
+	JOIN pg_catalog.pg_class AS t3 ON t3.relnamespace = t2.oid AND t3.relname = t1.table_name
+	LEFT JOIN pg_catalog.pg_partitioned_table AS t4 ON t4.partrelid = t3.oid
+	LEFT JOIN pg_depend AS t5 ON t5.objid = t3.oid AND t5.deptype = 'e'
+WHERE
+	t1.table_type = 'BASE TABLE'
+	AND NOT COALESCE(t3.relispartition, false)
+	AND t1.table_schema IN ('public', 'rw_catalog')
+	AND t5.objid IS NULL
+ORDER BY
+	t1.table_schema, t1.table_name;
+----
diff --git a/e2e_test/batch/functions/setting.slt.part b/e2e_test/batch/functions/setting.slt.part
index 233399d80a025..67468cd349114 100644
--- a/e2e_test/batch/functions/setting.slt.part
+++ b/e2e_test/batch/functions/setting.slt.part
@@ -17,3 +17,8 @@ query T
 SELECT set_config('client_min_messages', 'notice', false);
 ----
 notice
+
+query T
+SELECT setting FROM pg_settings WHERE name IN ('server_version_num', 'crdb_version') ORDER BY name DESC;
+----
+130014