diff --git a/mysql-test/suite/perfschema/r/dml_file_instances.result b/mysql-test/suite/perfschema/r/dml_file_instances.result
index 2df898cc1c6..7d25481662c 100644
--- a/mysql-test/suite/perfschema/r/dml_file_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_file_instances.result
@@ -34,57 +34,57 @@ OPEN_COUNT	Open handles on the file. A value of greater than zero means that the
 ###
 CREATE DATABASE db_26152751;
 USE db_26152751;
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 FILE_NAME
 CREATE TABLE t_db_26152751 (a INT) ENGINE=MYISAM;
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 FILE_NAME
 t_db_26152751.MYD
 t_db_26152751.MYI
 t_db_26152751.frm
 RENAME TABLE t_db_26152751 to t_db_26152751_new;
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 FILE_NAME
 t_db_26152751_new.MYD
 t_db_26152751_new.MYI
 t_db_26152751_new.frm
 RENAME TABLE t_db_26152751_new to t_db_26152751;
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 FILE_NAME
 t_db_26152751.MYD
 t_db_26152751.MYI
 t_db_26152751.frm
 ALTER TABLE t_db_26152751 ADD COLUMN b INT;
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 FILE_NAME
 t_db_26152751.frm
-t_db_26152751.MYI
 t_db_26152751.MYD
+t_db_26152751.MYI
 DROP TABLE t_db_26152751;
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 FILE_NAME
 CREATE TABLE t_db_26152751 (a INT) ENGINE=INNODB;
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 FILE_NAME
 t_db_26152751.frm
 t_db_26152751.ibd
 RENAME TABLE t_db_26152751 to t_db_26152751_new;
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 FILE_NAME
 t_db_26152751_new.frm
 t_db_26152751_new.ibd
 RENAME TABLE t_db_26152751_new to t_db_26152751;
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 FILE_NAME
 t_db_26152751.frm
 t_db_26152751.ibd
 ALTER TABLE t_db_26152751 ADD COLUMN b INT;
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 FILE_NAME
 t_db_26152751.frm
 t_db_26152751.ibd
 DROP TABLE t_db_26152751;
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 FILE_NAME
 DROP DATABASE db_26152751;
 #
diff --git a/mysql-test/suite/perfschema/t/dml_file_instances.test b/mysql-test/suite/perfschema/t/dml_file_instances.test
index b22903f45d6..820700b6a1b 100644
--- a/mysql-test/suite/perfschema/t/dml_file_instances.test
+++ b/mysql-test/suite/perfschema/t/dml_file_instances.test
@@ -49,58 +49,58 @@ where table_schema='performance_schema' and table_name='file_instances';
 CREATE DATABASE db_26152751;
 USE db_26152751;
 
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 
 CREATE TABLE t_db_26152751 (a INT) ENGINE=MYISAM;
 
 --sorted_result
 --replace_regex /.*\/t_db_26152751/t_db_26152751/
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 
 RENAME TABLE t_db_26152751 to t_db_26152751_new;
 
 --sorted_result
 --replace_regex /.*\/t_db_26152751/t_db_26152751/
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 
 RENAME TABLE t_db_26152751_new to t_db_26152751;
 
 --sorted_result
 --replace_regex /.*\/t_db_26152751/t_db_26152751/
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 
 ALTER TABLE t_db_26152751 ADD COLUMN b INT;
 
 --replace_regex /.*\/t_db_26152751/t_db_26152751/
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 
 DROP TABLE t_db_26152751;
 
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 
 CREATE TABLE t_db_26152751 (a INT) ENGINE=INNODB;
 
 --replace_regex /.*\/t_db_26152751/t_db_26152751/
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 
 RENAME TABLE t_db_26152751 to t_db_26152751_new;
 
 --replace_regex /.*\/t_db_26152751/t_db_26152751/
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 
 RENAME TABLE t_db_26152751_new to t_db_26152751;
 
 --replace_regex /.*\/t_db_26152751/t_db_26152751/
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 
 ALTER TABLE t_db_26152751 ADD COLUMN b INT;
 
 --replace_regex /.*\/t_db_26152751/t_db_26152751/
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 
 DROP TABLE t_db_26152751;
 
-SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
 
 DROP DATABASE db_26152751;