diff --git a/mysql-test/r/analyze_stmt_orderby.result b/mysql-test/r/analyze_stmt_orderby.result
index d26d32180c1..e4e039286d3 100644
--- a/mysql-test/r/analyze_stmt_orderby.result
+++ b/mysql-test/r/analyze_stmt_orderby.result
@@ -142,7 +142,7 @@ ANALYZE
       "r_loops": 1,
       "r_used_priority_queue": false,
       "r_output_rows": 10000,
-      "r_buffer_size": "195Kb",
+      "r_buffer_size": "REPLACED",
       "table": {
         "delete": 1,
         "table_name": "t2",
@@ -254,7 +254,7 @@ ANALYZE
         "r_loops": 1,
         "r_used_priority_queue": false,
         "r_output_rows": 10,
-        "r_buffer_size": "360",
+        "r_buffer_size": "REPLACED",
         "table": {
           "table_name": "t0",
           "access_type": "ALL",
diff --git a/mysql-test/r/explain_json_format_partitions.result b/mysql-test/r/explain_json_format_partitions.result
index 6a133ff1149..fa2b5681120 100644
--- a/mysql-test/r/explain_json_format_partitions.result
+++ b/mysql-test/r/explain_json_format_partitions.result
@@ -48,17 +48,19 @@ ANALYZE
 {
   "query_block": {
     "select_id": 1,
-    "table": {
-      "update": 1,
-      "table_name": "t1",
-      "partitions": ["p0"],
-      "access_type": "ALL",
-      "rows": 10,
-      "r_rows": 3,
-      "r_filtered": 100,
-      "using_io_buffer": 1,
-      "r_total_time_ms": "REPLACED",
-      "attached_condition": "(t1.a in (2,3,4))"
+    "r_total_time_ms": "REPLACED",
+    "buffer": {
+      "table": {
+        "update": 1,
+        "table_name": "t1",
+        "partitions": ["p0"],
+        "access_type": "ALL",
+        "rows": 10,
+        "r_rows": 10,
+        "r_filtered": 30,
+        "r_total_time_ms": "REPLACED",
+        "attached_condition": "(t1.a in (2,3,4))"
+      }
     }
   }
 }
@@ -67,6 +69,7 @@ ANALYZE
 {
   "query_block": {
     "select_id": 1,
+    "r_total_time_ms": "REPLACED",
     "table": {
       "delete": 1,
       "table_name": "t1",
diff --git a/mysql-test/t/analyze_stmt_orderby.test b/mysql-test/t/analyze_stmt_orderby.test
index 096bebbf147..7a7baa8d76b 100644
--- a/mysql-test/t/analyze_stmt_orderby.test
+++ b/mysql-test/t/analyze_stmt_orderby.test
@@ -42,7 +42,7 @@ explain
 delete from t2 order by b limit 5;
 explain format=json
 delete from t2 order by b limit 5;
---replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/
+--replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/  /"r_buffer_size": "[^"]+"/"r_buffer_size": "REPLACED"/ 
 analyze format=json
 delete from t2 order by b limit 5;
 
@@ -65,7 +65,7 @@ explain
 select * from t0,t2 where t2.a=t0.a order by t0.a limit 4;
 ## explain format=json
 ## select * from t0,t2 where t2.a=t0.a order by t0.a limit 4;
---replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/
+--replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/ /"r_buffer_size": "[^"]+"/"r_buffer_size": "REPLACED"/
 analyze format=json 
 select * from t0,t2 where t2.a=t0.a order by t0.a limit 4;