diff --git a/src/postgres/src/test/regress/expected/yb_pg_hint_plan_init.out b/src/postgres/src/test/regress/expected/yb_pg_hint_plan_init.out
index 6aa44bd0a076..1338d22d4f1a 100644
--- a/src/postgres/src/test/regress/expected/yb_pg_hint_plan_init.out
+++ b/src/postgres/src/test/regress/expected/yb_pg_hint_plan_init.out
@@ -1,5 +1,7 @@
 -- Testing pg_hint_plan
 -- Initialization of tables for pg_hint_plan test
+-- This test is derived from the init test in
+-- <https://github.com/ossc-db/pg_hint_plan/>.
 SET search_path TO public;
 CREATE EXTENSION pg_hint_plan;
 CREATE SCHEMA s0;
@@ -143,22 +145,19 @@ ERROR:  ALTER SYSTEM not supported yet
 LINE 6: ALTER SYSTEM SET effective_cache_size TO 16384;
         ^
 HINT:  Please report the issue on https://github.com/YugaByte/yugabyte-db/issues
-ERROR:  ALTER SYSTEM not supported yet
-LINE 6: ALTER SYSTEM SET effective_cache_size TO 16384;
-ERROR:  syntax error at or near "ERROR"
-LINE 1: ERROR:  ALTER SYSTEM not supported yet
-        ^
-        ^
-HINT:  Please report the issue on https://github.com/YugaByte/yugabyte-db/issues
 SELECT pg_reload_conf();
-ERROR:  syntax error at or near "^"
-LINE 1: ^
-        ^
+ pg_reload_conf
+----------------
+ t
+(1 row)
+
 SET effective_cache_size TO 16384;
+-- YB: modify view to avoid yb_ settings.
 CREATE VIEW settings AS
 SELECT name, setting, category
   FROM pg_settings
  WHERE category LIKE 'Query Tuning%'
+   AND name NOT LIKE 'yb_%'
     OR name = 'client_min_messages'
  ORDER BY category, name;
 SELECT * FROM settings;
@@ -211,84 +210,5 @@ SELECT * FROM settings;
  enable_tidscan                 | on        | Query Tuning / Planner Method Configuration
 (45 rows)
 
-ANALYZE;
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
-WARNING:  analyzing non-temporary tables will be ignored
+-- TODO(jason): uncomment when closing issue #1420.
+-- ANALYZE;
diff --git a/src/postgres/src/test/regress/expected/yb_pg_hint_plan_test1.out b/src/postgres/src/test/regress/expected/yb_pg_hint_plan_test1.out
index 65c2d5c1a604..46fd28fed996 100644
--- a/src/postgres/src/test/regress/expected/yb_pg_hint_plan_test1.out
+++ b/src/postgres/src/test/regress/expected/yb_pg_hint_plan_test1.out
@@ -1,3 +1,5 @@
+-- This test is derived from the pg_hint_plan test in
+-- <https://github.com/ossc-db/pg_hint_plan/>.
 SET search_path TO public;
 SET client_min_messages TO log;
 \set SHOW_CONTEXT always
diff --git a/src/postgres/src/test/regress/sql/yb_pg_hint_plan_init.sql b/src/postgres/src/test/regress/sql/yb_pg_hint_plan_init.sql
index 2b4cfbdb02a3..3edb0f107666 100644
--- a/src/postgres/src/test/regress/sql/yb_pg_hint_plan_init.sql
+++ b/src/postgres/src/test/regress/sql/yb_pg_hint_plan_init.sql
@@ -1,5 +1,7 @@
 -- Testing pg_hint_plan
 -- Initialization of tables for pg_hint_plan test
+-- This test is derived from the init test in
+-- <https://github.com/ossc-db/pg_hint_plan/>.
 SET search_path TO public;
 
 CREATE EXTENSION pg_hint_plan;
@@ -131,19 +133,18 @@ CREATE VIEW v4 AS SELECT v_2.t1_id, t_3.id FROM v2 v_2, t3 t_3 WHERE v_2.t1_id =
 
 /* Fix auto-tunable parameters */
 ALTER SYSTEM SET effective_cache_size TO 16384;
-ERROR:  ALTER SYSTEM not supported yet
-LINE 6: ALTER SYSTEM SET effective_cache_size TO 16384;
-        ^
-HINT:  Please report the issue on https://github.com/YugaByte/yugabyte-db/issues
 SELECT pg_reload_conf();
 SET effective_cache_size TO 16384;
 
+-- YB: modify view to avoid yb_ settings.
 CREATE VIEW settings AS
 SELECT name, setting, category
   FROM pg_settings
  WHERE category LIKE 'Query Tuning%'
+   AND name NOT LIKE 'yb_%'
     OR name = 'client_min_messages'
  ORDER BY category, name;
 SELECT * FROM settings;
 
-ANALYZE;
+-- TODO(jason): uncomment when closing issue #1420.
+-- ANALYZE;
diff --git a/src/postgres/src/test/regress/sql/yb_pg_hint_plan_test1.sql b/src/postgres/src/test/regress/sql/yb_pg_hint_plan_test1.sql
index 12e4b584d828..55a46bec656b 100644
--- a/src/postgres/src/test/regress/sql/yb_pg_hint_plan_test1.sql
+++ b/src/postgres/src/test/regress/sql/yb_pg_hint_plan_test1.sql
@@ -1,3 +1,5 @@
+-- This test is derived from the pg_hint_plan test in
+-- <https://github.com/ossc-db/pg_hint_plan/>.
 SET search_path TO public;
 SET client_min_messages TO log;
 \set SHOW_CONTEXT always