diff --git a/mysql-test/main/tmp_table_count-7586.result b/mysql-test/main/tmp_table_count-7586.result
index ebb2333113f..8521b945c26 100644
--- a/mysql-test/main/tmp_table_count-7586.result
+++ b/mysql-test/main/tmp_table_count-7586.result
@@ -7,10 +7,8 @@ a
 1
 2
 3
-show status like '%Created_tmp%';
+show status like '%Created_tmp_tables%';
 Variable_name	Value
-Created_tmp_disk_tables	0
-Created_tmp_files	0
 Created_tmp_tables	0
 explain select * from v2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -20,10 +18,8 @@ a
 1
 2
 3
-show status like '%Created_tmp%';
+show status like '%Created_tmp_tables%';
 Variable_name	Value
-Created_tmp_disk_tables	0
-Created_tmp_files	0
 Created_tmp_tables	0
 explain select * from (select * from t2) T1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -46,10 +42,8 @@ CREATE TABLE t3 SELECT * FROM t1 WHERE a IN (SELECT * FROM t2 GROUP BY a HAVING
 select sum(created_tmp_tables) from performance_schema.events_statements_history_long;
 sum(created_tmp_tables)
 2
-show status like '%Created_tmp%';
+show status like '%Created_tmp_tables%';
 Variable_name	Value
-Created_tmp_disk_tables	0
-Created_tmp_files	0
 Created_tmp_tables	2
 drop table t3;
 set @@optimizer_switch="firstmatch=off";
@@ -65,10 +59,8 @@ CREATE TABLE t3 SELECT * FROM t1 WHERE a IN (SELECT * FROM t2 GROUP BY a);
 select sum(created_tmp_tables) from performance_schema.events_statements_history_long;
 sum(created_tmp_tables)
 1
-show status like '%Created_tmp%';
+show status like '%Created_tmp_tables%';
 Variable_name	Value
-Created_tmp_disk_tables	0
-Created_tmp_files	0
 Created_tmp_tables	1
 set @@optimizer_switch=default;
 drop table t1,t2,t3;
@@ -78,8 +70,6 @@ flush status;
 select sum(created_tmp_tables) from performance_schema.events_statements_history_long;
 sum(created_tmp_tables)
 0
-show status like '%Created_tmp%';
+show status like '%Created_tmp_tables%';
 Variable_name	Value
-Created_tmp_disk_tables	0
-Created_tmp_files	0
 Created_tmp_tables	0
diff --git a/mysql-test/main/tmp_table_count-7586.test b/mysql-test/main/tmp_table_count-7586.test
index 8fe9e3d2eff..37f37541024 100644
--- a/mysql-test/main/tmp_table_count-7586.test
+++ b/mysql-test/main/tmp_table_count-7586.test
@@ -14,14 +14,14 @@ create view v2 as select a from t2;
 flush status;
 select * from v2;
 --disable_ps_protocol
-show status like '%Created_tmp%';
+show status like '%Created_tmp_tables%';
 --enable_ps_protocol
 
 explain select * from v2;
 
 select * from (select * from t2) T1;
 --disable_ps_protocol
-show status like '%Created_tmp%';
+show status like '%Created_tmp_tables%';
 --enable_ps_protocol
 
 explain select * from (select * from t2) T1;
@@ -44,7 +44,7 @@ flush status;
 CREATE TABLE t3 SELECT * FROM t1 WHERE a IN (SELECT * FROM t2 GROUP BY a HAVING a > 1);
 --echo # Performance schema should be the same as "Created_tmp_tables" variable below
 select sum(created_tmp_tables) from performance_schema.events_statements_history_long;
-show status like '%Created_tmp%';
+show status like '%Created_tmp_tables%';
 drop table t3;
 
 set @@optimizer_switch="firstmatch=off";
@@ -54,7 +54,7 @@ flush status;
 CREATE TABLE t3 SELECT * FROM t1 WHERE a IN (SELECT * FROM t2 GROUP BY a);
 --echo # Performance schema should be the same as "Created_tmp_tables" variable below
 select sum(created_tmp_tables) from performance_schema.events_statements_history_long;
-show status like '%Created_tmp%';
+show status like '%Created_tmp_tables%';
 set @@optimizer_switch=default;
 
 drop table t1,t2,t3;
@@ -63,4 +63,4 @@ truncate table performance_schema.events_statements_history_long;
 flush status;
 --echo # Performance schema should be the same as "Created_tmp_tables" variable below
 select sum(created_tmp_tables) from performance_schema.events_statements_history_long;
-show status like '%Created_tmp%';
+show status like '%Created_tmp_tables%';