diff --git a/src/test/isolation2/expected/segwalrep/dtm_recovery_on_standby.out b/src/test/isolation2/expected/segwalrep/dtm_recovery_on_standby.out
index 76f12f54a10..b5c6be0e77e 100644
--- a/src/test/isolation2/expected/segwalrep/dtm_recovery_on_standby.out
+++ b/src/test/isolation2/expected/segwalrep/dtm_recovery_on_standby.out
@@ -62,6 +62,14 @@ select pg_ctl(datadir, 'promote') from gp_segment_configuration where content =
 
 -- end_ignore
 (exited with code 0)
+
+-- wait some seconds until the promotion is done.
+!\retcode sleep 2;
+-- start_ignore
+
+-- end_ignore
+(exited with code 0)
+
 -- "-1S" means connect to standby's port assuming it's accepting
 -- connections.  This select should succeed because the create table
 -- transaction's commit prepared broadcast must have been sent by
diff --git a/src/test/isolation2/sql/segwalrep/dtm_recovery_on_standby.sql b/src/test/isolation2/sql/segwalrep/dtm_recovery_on_standby.sql
index 15e97d213f0..5e1006e9c3c 100644
--- a/src/test/isolation2/sql/segwalrep/dtm_recovery_on_standby.sql
+++ b/src/test/isolation2/sql/segwalrep/dtm_recovery_on_standby.sql
@@ -39,6 +39,10 @@ select pg_ctl(datadir, 'promote') from gp_segment_configuration
 where content = -1 and role = 'm';
 
 !\retcode gpfts -A -D;
+
+-- wait some seconds until the promotion is done.
+!\retcode sleep 2;
+
 -- "-1S" means connect to standby's port assuming it's accepting
 -- connections.  This select should succeed because the create table
 -- transaction's commit prepared broadcast must have been sent by
@@ -116,4 +120,4 @@ select wait_until_standby_in_state('streaming');
 
 -- start_ignore
 reset statement_timeout;
--- end_ignore
\ No newline at end of file
+-- end_ignore
diff --git a/src/test/regress/expected/window.out b/src/test/regress/expected/window.out
index 31a33926ffa..d718af699b3 100644
--- a/src/test/regress/expected/window.out
+++ b/src/test/regress/expected/window.out
@@ -1,6 +1,10 @@
 -- TODO: incremental sort is turned off by default, because it may have
 -- wrong result for some core case. Turn it on to run the existing tests
 -- and minimize the difference from upstream.
+-- start_matchignore
+-- m/INFO:  GPORCA failed to produce a plan, falling back to Postgres-based planner/
+-- m/DETAIL:  Falling back to Postgres-based planner because GPORCA does not support the following feature: Non-default collation/
+-- end_matchignore
 set enable_incremental_sort=on;
 --
 -- WINDOW FUNCTIONS
diff --git a/src/test/regress/expected/window_optimizer.out b/src/test/regress/expected/window_optimizer.out
index b1ca5f31dec..cb80eb0fa79 100644
--- a/src/test/regress/expected/window_optimizer.out
+++ b/src/test/regress/expected/window_optimizer.out
@@ -1,6 +1,10 @@
 -- TODO: incremental sort is turned off by default, because it may have
 -- wrong result for some core case. Turn it on to run the existing tests
 -- and minimize the difference from upstream.
+-- start_matchignore
+-- m/INFO:  GPORCA failed to produce a plan, falling back to Postgres-based planner/
+-- m/DETAIL:  Falling back to Postgres-based planner because GPORCA does not support the following feature: Non-default collation/
+-- end_matchignore
 set enable_incremental_sort=on;
 --
 -- WINDOW FUNCTIONS
diff --git a/src/test/regress/sql/window.sql b/src/test/regress/sql/window.sql
index 0605874f7e4..b47f8a84830 100644
--- a/src/test/regress/sql/window.sql
+++ b/src/test/regress/sql/window.sql
@@ -1,6 +1,10 @@
 -- TODO: incremental sort is turned off by default, because it may have
 -- wrong result for some core case. Turn it on to run the existing tests
 -- and minimize the difference from upstream.
+-- start_matchignore
+-- m/INFO:  GPORCA failed to produce a plan, falling back to Postgres-based planner/
+-- m/DETAIL:  Falling back to Postgres-based planner because GPORCA does not support the following feature: Non-default collation/
+-- end_matchignore
 set enable_incremental_sort=on;
 
 --