diff --git a/contrib/pax_storage/src/test/regress/expected/subselect_gp2.out b/contrib/pax_storage/src/test/regress/expected/subselect_gp2.out
index acf1cacc52a..982e377dab0 100644
--- a/contrib/pax_storage/src/test/regress/expected/subselect_gp2.out
+++ b/contrib/pax_storage/src/test/regress/expected/subselect_gp2.out
@@ -44,22 +44,22 @@ explain select * from generate_series(1,2) s1 join pg_class on true where s1=(se
 (7 rows)
 
 -- Planner test: constant folding in subplan testexpr  produces no error
-create table subselect_t1 (a int, b int, c int) distributed by (a);
-create table subselect_t2 (a int, b int, c int) distributed by (a);
-insert into subselect_t1 values (1,1,1);
-insert into subselect_t2 values (1,1,1);
-select * from subselect_t1 where NULL in (select c from subselect_t2);
+create table subselect_gp2_t1 (a int, b int, c int) distributed by (a);
+create table subselect_gp2_t2 (a int, b int, c int) distributed by (a);
+insert into subselect_gp2_t1 values (1,1,1);
+insert into subselect_gp2_t2 values (1,1,1);
+select * from subselect_gp2_t1 where NULL in (select c from subselect_gp2_t2);
  a | b | c 
 ---+---+---
 (0 rows)
 
-select * from subselect_t1 where NULL in (select c from subselect_t2) and exists (select generate_series(1,2));
+select * from subselect_gp2_t1 where NULL in (select c from subselect_gp2_t2) and exists (select generate_series(1,2));
  a | b | c 
 ---+---+---
 (0 rows)
 
 -- Planner test to make sure initplan is removed when no param is used
-select * from subselect_t2 where false and exists (select generate_series(1,2));
+select * from subselect_gp2_t2 where false and exists (select generate_series(1,2));
  a | b | c 
 ---+---+---
 (0 rows)
diff --git a/contrib/pax_storage/src/test/regress/sql/subselect_gp2.sql b/contrib/pax_storage/src/test/regress/sql/subselect_gp2.sql
index 3c20cc38853..6063c77f605 100644
--- a/contrib/pax_storage/src/test/regress/sql/subselect_gp2.sql
+++ b/contrib/pax_storage/src/test/regress/sql/subselect_gp2.sql
@@ -25,17 +25,17 @@ where (select count(*) from echotable as i where i.c2 = o.c2) >= 2;
 explain select * from generate_series(1,2) s1 join pg_class on true where s1=(select pg_backend_pid());
 
 -- Planner test: constant folding in subplan testexpr  produces no error
-create table subselect_t1 (a int, b int, c int) distributed by (a);
-create table subselect_t2 (a int, b int, c int) distributed by (a);
+create table subselect_gp2_t1 (a int, b int, c int) distributed by (a);
+create table subselect_gp2_t2 (a int, b int, c int) distributed by (a);
 
-insert into subselect_t1 values (1,1,1);
-insert into subselect_t2 values (1,1,1);
+insert into subselect_gp2_t1 values (1,1,1);
+insert into subselect_gp2_t2 values (1,1,1);
 
-select * from subselect_t1 where NULL in (select c from subselect_t2);
-select * from subselect_t1 where NULL in (select c from subselect_t2) and exists (select generate_series(1,2));
+select * from subselect_gp2_t1 where NULL in (select c from subselect_gp2_t2);
+select * from subselect_gp2_t1 where NULL in (select c from subselect_gp2_t2) and exists (select generate_series(1,2));
 
 -- Planner test to make sure initplan is removed when no param is used
-select * from subselect_t2 where false and exists (select generate_series(1,2));
+select * from subselect_gp2_t2 where false and exists (select generate_series(1,2));
 
 
 --
diff --git a/src/test/regress/expected/subselect_gp2.out b/src/test/regress/expected/subselect_gp2.out
index acf1cacc52a..982e377dab0 100644
--- a/src/test/regress/expected/subselect_gp2.out
+++ b/src/test/regress/expected/subselect_gp2.out
@@ -44,22 +44,22 @@ explain select * from generate_series(1,2) s1 join pg_class on true where s1=(se
 (7 rows)
 
 -- Planner test: constant folding in subplan testexpr  produces no error
-create table subselect_t1 (a int, b int, c int) distributed by (a);
-create table subselect_t2 (a int, b int, c int) distributed by (a);
-insert into subselect_t1 values (1,1,1);
-insert into subselect_t2 values (1,1,1);
-select * from subselect_t1 where NULL in (select c from subselect_t2);
+create table subselect_gp2_t1 (a int, b int, c int) distributed by (a);
+create table subselect_gp2_t2 (a int, b int, c int) distributed by (a);
+insert into subselect_gp2_t1 values (1,1,1);
+insert into subselect_gp2_t2 values (1,1,1);
+select * from subselect_gp2_t1 where NULL in (select c from subselect_gp2_t2);
  a | b | c 
 ---+---+---
 (0 rows)
 
-select * from subselect_t1 where NULL in (select c from subselect_t2) and exists (select generate_series(1,2));
+select * from subselect_gp2_t1 where NULL in (select c from subselect_gp2_t2) and exists (select generate_series(1,2));
  a | b | c 
 ---+---+---
 (0 rows)
 
 -- Planner test to make sure initplan is removed when no param is used
-select * from subselect_t2 where false and exists (select generate_series(1,2));
+select * from subselect_gp2_t2 where false and exists (select generate_series(1,2));
  a | b | c 
 ---+---+---
 (0 rows)
diff --git a/src/test/regress/sql/subselect_gp2.sql b/src/test/regress/sql/subselect_gp2.sql
index 3c20cc38853..6063c77f605 100644
--- a/src/test/regress/sql/subselect_gp2.sql
+++ b/src/test/regress/sql/subselect_gp2.sql
@@ -25,17 +25,17 @@ where (select count(*) from echotable as i where i.c2 = o.c2) >= 2;
 explain select * from generate_series(1,2) s1 join pg_class on true where s1=(select pg_backend_pid());
 
 -- Planner test: constant folding in subplan testexpr  produces no error
-create table subselect_t1 (a int, b int, c int) distributed by (a);
-create table subselect_t2 (a int, b int, c int) distributed by (a);
+create table subselect_gp2_t1 (a int, b int, c int) distributed by (a);
+create table subselect_gp2_t2 (a int, b int, c int) distributed by (a);
 
-insert into subselect_t1 values (1,1,1);
-insert into subselect_t2 values (1,1,1);
+insert into subselect_gp2_t1 values (1,1,1);
+insert into subselect_gp2_t2 values (1,1,1);
 
-select * from subselect_t1 where NULL in (select c from subselect_t2);
-select * from subselect_t1 where NULL in (select c from subselect_t2) and exists (select generate_series(1,2));
+select * from subselect_gp2_t1 where NULL in (select c from subselect_gp2_t2);
+select * from subselect_gp2_t1 where NULL in (select c from subselect_gp2_t2) and exists (select generate_series(1,2));
 
 -- Planner test to make sure initplan is removed when no param is used
-select * from subselect_t2 where false and exists (select generate_series(1,2));
+select * from subselect_gp2_t2 where false and exists (select generate_series(1,2));
 
 
 --
diff --git a/src/test/singlenode_regress/expected/subselect_gp2.out b/src/test/singlenode_regress/expected/subselect_gp2.out
index 4122b8a210c..2746d633441 100644
--- a/src/test/singlenode_regress/expected/subselect_gp2.out
+++ b/src/test/singlenode_regress/expected/subselect_gp2.out
@@ -45,22 +45,22 @@ explain select * from generate_series(1,2) s1 join pg_class on true where s1=(se
 (7 rows)
 
 -- Planner test: constant folding in subplan testexpr  produces no error
-create table subselect_t1 (a int, b int, c int);
-create table subselect_t2 (a int, b int, c int);
-insert into subselect_t1 values (1,1,1);
-insert into subselect_t2 values (1,1,1);
-select * from subselect_t1 where NULL in (select c from subselect_t2);
+create table subselect_gp2_t1 (a int, b int, c int);
+create table subselect_gp2_t2 (a int, b int, c int);
+insert into subselect_gp2_t1 values (1,1,1);
+insert into subselect_gp2_t2 values (1,1,1);
+select * from subselect_gp2_t1 where NULL in (select c from subselect_gp2_t2);
  a | b | c 
 ---+---+---
 (0 rows)
 
-select * from subselect_t1 where NULL in (select c from subselect_t2) and exists (select generate_series(1,2));
+select * from subselect_gp2_t1 where NULL in (select c from subselect_gp2_t2) and exists (select generate_series(1,2));
  a | b | c 
 ---+---+---
 (0 rows)
 
 -- Planner test to make sure initplan is removed when no param is used
-select * from subselect_t2 where false and exists (select generate_series(1,2));
+select * from subselect_gp2_t2 where false and exists (select generate_series(1,2));
  a | b | c 
 ---+---+---
 (0 rows)
diff --git a/src/test/singlenode_regress/sql/subselect_gp2.sql b/src/test/singlenode_regress/sql/subselect_gp2.sql
index a101c385730..a14a3c70540 100644
--- a/src/test/singlenode_regress/sql/subselect_gp2.sql
+++ b/src/test/singlenode_regress/sql/subselect_gp2.sql
@@ -26,17 +26,17 @@ where (select count(*) from echotable as i where i.c2 = o.c2) >= 1;
 explain select * from generate_series(1,2) s1 join pg_class on true where s1=(select pg_backend_pid());
 
 -- Planner test: constant folding in subplan testexpr  produces no error
-create table subselect_t1 (a int, b int, c int);
-create table subselect_t2 (a int, b int, c int);
+create table subselect_gp2_t1 (a int, b int, c int);
+create table subselect_gp2_t2 (a int, b int, c int);
 
-insert into subselect_t1 values (1,1,1);
-insert into subselect_t2 values (1,1,1);
+insert into subselect_gp2_t1 values (1,1,1);
+insert into subselect_gp2_t2 values (1,1,1);
 
-select * from subselect_t1 where NULL in (select c from subselect_t2);
-select * from subselect_t1 where NULL in (select c from subselect_t2) and exists (select generate_series(1,2));
+select * from subselect_gp2_t1 where NULL in (select c from subselect_gp2_t2);
+select * from subselect_gp2_t1 where NULL in (select c from subselect_gp2_t2) and exists (select generate_series(1,2));
 
 -- Planner test to make sure initplan is removed when no param is used
-select * from subselect_t2 where false and exists (select generate_series(1,2));
+select * from subselect_gp2_t2 where false and exists (select generate_series(1,2));
 
 
 --