diff --git a/mysql-test/suite/innodb/r/temp_truncate_freed.result b/mysql-test/suite/innodb/r/temp_truncate_freed.result
index 1ec26d6ada3..1a25a7c7bea 100644
--- a/mysql-test/suite/innodb/r/temp_truncate_freed.result
+++ b/mysql-test/suite/innodb/r/temp_truncate_freed.result
@@ -7,5 +7,5 @@ INSERT INTO t1 VALUES (repeat(1,16777215));
 DROP TEMPORARY TABLE t1;
 SET GLOBAL innodb_truncate_temporary_tablespace_now=1;
 SET GLOBAL innodb_buffer_pool_size=10485760;
-set global innodb_buffer_pool_size = @old_innodb_buffer_pool_size;
 set global innodb_immediate_scrub_data_uncompressed = @old_immediate_scrub_data_val;
+set global innodb_buffer_pool_size = @old_innodb_buffer_pool_size;
diff --git a/mysql-test/suite/innodb/t/temp_truncate_freed.test b/mysql-test/suite/innodb/t/temp_truncate_freed.test
index d0a6b5fedf1..a09cecc5f9c 100644
--- a/mysql-test/suite/innodb/t/temp_truncate_freed.test
+++ b/mysql-test/suite/innodb/t/temp_truncate_freed.test
@@ -3,8 +3,14 @@
 set @old_innodb_buffer_pool_size = @@innodb_buffer_pool_size;
 set @old_immediate_scrub_data_val= @@innodb_immediate_scrub_data_uncompressed;
 
+let $wait_condition =
+  SELECT SUBSTR(variable_value, 1, 30) = 'Completed resizing buffer pool'
+  FROM information_schema.global_status
+  WHERE LOWER(variable_name) = 'innodb_buffer_pool_resize_status';
+
 SET GLOBAL innodb_immediate_scrub_data_uncompressed=1;
 SET GLOBAL innodb_buffer_pool_size= 16777216;
+--source include/wait_condition.inc
 
 CREATE TEMPORARY TABLE t1(c1 MEDIUMTEXT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (repeat(1,16777215));
@@ -13,13 +19,18 @@ SET GLOBAL innodb_truncate_temporary_tablespace_now=1;
 
 let $wait_timeout = 180;
 let $wait_condition =
-  SELECT SUBSTR(variable_value, 1, 30) = 'Completed resizing buffer pool'
+  SELECT SUBSTR(variable_value, 1, 45) = 'Completed resizing buffer pool from 16777216'
   FROM information_schema.global_status
   WHERE LOWER(variable_name) = 'innodb_buffer_pool_resize_status';
 
 SET GLOBAL innodb_buffer_pool_size=10485760;
 --source include/wait_condition.inc
 
-set global innodb_buffer_pool_size = @old_innodb_buffer_pool_size;
 set global innodb_immediate_scrub_data_uncompressed = @old_immediate_scrub_data_val;
+
+let $wait_condition =
+  SELECT SUBSTR(variable_value, 1, 45) = 'Completed resizing buffer pool from 10485760'
+  FROM information_schema.global_status
+  WHERE LOWER(variable_name) = 'innodb_buffer_pool_resize_status';
+set global innodb_buffer_pool_size = @old_innodb_buffer_pool_size;
 --source include/wait_condition.inc
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index 0832aefe364..8703ad95dae 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -2061,10 +2061,12 @@ calc_buf_pool_size:
 	}
 
 	if (srv_buf_pool_old_size != srv_buf_pool_size) {
-
-	        buf_resize_status("Completed resizing buffer pool from %zu to %zu bytes."
-			    ,srv_buf_pool_old_size, srv_buf_pool_size);
+		std::ostringstream sout;
+		sout << "Completed resizing buffer pool from "
+		     << srv_buf_pool_old_size << " to "
+		     << srv_buf_pool_size <<" bytes.";
 		srv_buf_pool_old_size = srv_buf_pool_size;
+		buf_resize_status(sout.str().c_str());
 	}
 
 #ifdef BTR_CUR_HASH_ADAPT