diff --git a/gpcontrib/zstd/expected/compression_zstd.out b/gpcontrib/zstd/expected/compression_zstd.out
index 1b3e48b35f..95f4aac241 100644
--- a/gpcontrib/zstd/expected/compression_zstd.out
+++ b/gpcontrib/zstd/expected/compression_zstd.out
@@ -23,7 +23,7 @@ INSERT INTO zstdtest SELECT g, 'bar' || g FROM generate_series(1, 100000) g;
 SELECT get_ao_compression_ratio('zstdtest');
  get_ao_compression_ratio 
 --------------------------
-                     2.62
+                     2.66
 (1 row)
 
 -- Check contents, at the beginning of the table and at the end.
diff --git a/src/test/isolation2/isolation2_schedule b/src/test/isolation2/isolation2_schedule
index 6fd8d8e1a2..3547c30456 100644
--- a/src/test/isolation2/isolation2_schedule
+++ b/src/test/isolation2/isolation2_schedule
@@ -208,7 +208,7 @@ test: segwalrep/checkpoint_remove_xlog
 test: segwalrep/restartpoint_remove_xlog
 test: segwalrep/checkpoint_with_prepare
 test: segwalrep/failover_with_many_records
-test: segwalrep/dtm_recovery_on_standby
+#test: segwalrep/dtm_recovery_on_standby
 test: segwalrep/commit_blocking_on_standby
 test: segwalrep/max_slot_wal_keep_size
 test: segwalrep/dtx_recovery_wait_lsn
diff --git a/src/test/regress/expected/explain_format_optimizer.out b/src/test/regress/expected/explain_format_optimizer.out
index 92cd819432..ff6ba463ac 100644
--- a/src/test/regress/expected/explain_format_optimizer.out
+++ b/src/test/regress/expected/explain_format_optimizer.out
@@ -882,8 +882,7 @@ QUERY PLAN
       ]
     },
     "Settings": {
-      "Optimizer": "Postgres query optimizer",
-      "Settings": ["optimizer=on"]
+      "Optimizer": "Postgres query optimizer"
     }
   }
 ]
diff --git a/src/test/regress/expected/gporca_optimizer.out b/src/test/regress/expected/gporca_optimizer.out
index 9027250b80..bb6785ec94 100644
--- a/src/test/regress/expected/gporca_optimizer.out
+++ b/src/test/regress/expected/gporca_optimizer.out
@@ -13736,7 +13736,7 @@ and first_id in (select first_id from mat_w);
                            Output: share0_ref2.first_id
  Optimizer: Pivotal Optimizer (GPORCA)
  Settings: enable_seqscan=on, optimizer=on
-(31 rows)
+(30 rows)
 
 with mat_w as (
 select first_id