diff --git a/mysql-test/suite/innodb/r/innodb_encryption_debug.result b/mysql-test/suite/innodb/r/innodb_encryption_debug.result
index 781796bb69a..503c56e32fd 100644
--- a/mysql-test/suite/innodb/r/innodb_encryption_debug.result
+++ b/mysql-test/suite/innodb/r/innodb_encryption_debug.result
@@ -5,15 +5,15 @@ innodb_encrypt_tables	ON
 innodb_encryption_rotate_key_age	2
 innodb_encryption_rotation_iops	100
 innodb_encryption_threads	4
-select space,name,min_key_version,current_key_version from information_schema.innodb_tablespaces_encryption;
-space	name	min_key_version	current_key_version
-1	mysql/innodb_table_stats	0	1
-2	mysql/innodb_index_stats	0	1
-0	NULL	0	1
+select space,name,current_key_version from information_schema.innodb_tablespaces_encryption order by space;
+space	name	current_key_version
+0	NULL	1
+1	mysql/innodb_table_stats	1
+2	mysql/innodb_index_stats	1
 set global debug_key_management_version=10;
-select space,name,min_key_version,current_key_version from information_schema.innodb_tablespaces_encryption;
-space	name	min_key_version	current_key_version
-1	mysql/innodb_table_stats	0	10
-2	mysql/innodb_index_stats	0	10
-0	NULL	0	10
+select space,name,current_key_version from information_schema.innodb_tablespaces_encryption order by space;
+space	name	current_key_version
+0	NULL	10
+1	mysql/innodb_table_stats	10
+2	mysql/innodb_index_stats	10
 set global debug_key_management_version=1;
diff --git a/mysql-test/suite/innodb/t/innodb_encryption_debug.test b/mysql-test/suite/innodb/t/innodb_encryption_debug.test
index 13c2a786d6a..f733d6ec91c 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption_debug.test
+++ b/mysql-test/suite/innodb/t/innodb_encryption_debug.test
@@ -6,8 +6,16 @@ if (`select count(*) = 0 from information_schema.plugins
 }
 
 show variables like 'innodb_encrypt%';
-select space,name,min_key_version,current_key_version from information_schema.innodb_tablespaces_encryption;
+
+let $wait_condition= select count(*) = 3 from information_schema.innodb_tablespaces_encryption where current_key_version=1;
+--source include/wait_condition.inc
+
+select space,name,current_key_version from information_schema.innodb_tablespaces_encryption order by space;
 set global debug_key_management_version=10;
-select space,name,min_key_version,current_key_version from information_schema.innodb_tablespaces_encryption;
+
+let $wait_condition= select count(*) = 3 from information_schema.innodb_tablespaces_encryption where current_key_version=10;
+--source include/wait_condition.inc
+
+select space,name,current_key_version from information_schema.innodb_tablespaces_encryption order by space;
 set global debug_key_management_version=1;