diff --git a/src/test/regress/expected/upgrade_columnar_after.out b/src/test/regress/expected/upgrade_columnar_after.out
index 62f9414a7..51c17b5ab 100644
--- a/src/test/regress/expected/upgrade_columnar_after.out
+++ b/src/test/regress/expected/upgrade_columnar_after.out
@@ -184,12 +184,12 @@ SELECT count(*) FROM less_common_data_types_table WHERE dist_key = 1 AND col1 =
 set columnar.enable_custom_scan to 'off';
 set enable_seqscan to off;
 set seq_page_cost TO 10000000;
-EXPLAIN (costs off, timing off, summary off, analyze on, BUFFERS OFF)
+EXPLAIN (costs off, timing off, summary off, analyze off, BUFFERS OFF)
 	SELECT count(*) FROM less_common_data_types_table WHERE dist_key = 1 AND col1 = ARRAY[1];
-                                                 QUERY PLAN
+                                     QUERY PLAN
 ---------------------------------------------------------------------
- Aggregate (actual rows=1 loops=1)
-   ->  Index Scan using non_unique_index_on_columnar on less_common_data_types_table (actual rows=1 loops=1)
+ Aggregate
+   ->  Index Scan using non_unique_index_on_columnar on less_common_data_types_table
          Index Cond: ((dist_key = 1) AND (col1 = '{1}'::integer[]))
 (3 rows)
 
diff --git a/src/test/regress/expected/upgrade_columnar_before.out b/src/test/regress/expected/upgrade_columnar_before.out
index 500407cf7..c02e61c79 100644
--- a/src/test/regress/expected/upgrade_columnar_before.out
+++ b/src/test/regress/expected/upgrade_columnar_before.out
@@ -337,12 +337,12 @@ SELECT count(*) FROM less_common_data_types_table WHERE dist_key = 1 AND col1 =
 set columnar.enable_custom_scan to 'off';
 set enable_seqscan to off;
 set seq_page_cost TO 10000000;
-EXPLAIN (costs off, timing off, summary off, analyze on, BUFFERS OFF)
+EXPLAIN (costs off, timing off, summary off, analyze off, BUFFERS OFF)
 	SELECT count(*) FROM less_common_data_types_table WHERE dist_key = 1 AND col1 = ARRAY[1];
-                                                 QUERY PLAN
+                                     QUERY PLAN
 ---------------------------------------------------------------------
- Aggregate (actual rows=1 loops=1)
-   ->  Index Scan using non_unique_index_on_columnar on less_common_data_types_table (actual rows=1 loops=1)
+ Aggregate
+   ->  Index Scan using non_unique_index_on_columnar on less_common_data_types_table
          Index Cond: ((dist_key = 1) AND (col1 = '{1}'::integer[]))
 (3 rows)
 
diff --git a/src/test/regress/sql/upgrade_columnar_after.sql b/src/test/regress/sql/upgrade_columnar_after.sql
index cd1be9443..dcf9f2b4e 100644
--- a/src/test/regress/sql/upgrade_columnar_after.sql
+++ b/src/test/regress/sql/upgrade_columnar_after.sql
@@ -65,7 +65,7 @@ set columnar.enable_custom_scan to 'off';
 set enable_seqscan to off;
 set seq_page_cost TO 10000000;
 
-EXPLAIN (costs off, timing off, summary off, analyze on, BUFFERS OFF)
+EXPLAIN (costs off, timing off, summary off, analyze off, BUFFERS OFF)
 	SELECT count(*) FROM less_common_data_types_table WHERE dist_key = 1 AND col1 = ARRAY[1];
 
 -- make sure that we re-enable columnar scan
diff --git a/src/test/regress/sql/upgrade_columnar_before.sql b/src/test/regress/sql/upgrade_columnar_before.sql
index 9c943ef16..d6a7d0371 100644
--- a/src/test/regress/sql/upgrade_columnar_before.sql
+++ b/src/test/regress/sql/upgrade_columnar_before.sql
@@ -253,7 +253,7 @@ set columnar.enable_custom_scan to 'off';
 set enable_seqscan to off;
 set seq_page_cost TO 10000000;
 
-EXPLAIN (costs off, timing off, summary off, analyze on, BUFFERS OFF)
+EXPLAIN (costs off, timing off, summary off, analyze off, BUFFERS OFF)
 	SELECT count(*) FROM less_common_data_types_table WHERE dist_key = 1 AND col1 = ARRAY[1];
 
 -- make sure that we re-enable columnar scan