diff --git a/mysql-test/suite/encryption/r/debug_key_management.result b/mysql-test/suite/encryption/r/debug_key_management.result
index 70840fdeeac..02e05b4d221 100644
--- a/mysql-test/suite/encryption/r/debug_key_management.result
+++ b/mysql-test/suite/encryption/r/debug_key_management.result
@@ -6,16 +6,12 @@ innodb_encrypt_tables	ON
 innodb_encryption_rotate_key_age	2
 innodb_encryption_rotation_iops	100
 innodb_encryption_threads	4
-select space,name,current_key_version from information_schema.innodb_tablespaces_encryption order by space;
-space	name	current_key_version
-0	./ibdata1	1
-1	mysql/innodb_table_stats	1
-2	mysql/innodb_index_stats	1
+select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 1;
+count(*)
+0
 set global debug_key_management_version=10;
-select space,name,current_key_version from information_schema.innodb_tablespaces_encryption order by space;
-space	name	current_key_version
-0	./ibdata1	10
-1	mysql/innodb_table_stats	10
-2	mysql/innodb_index_stats	10
+select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10;
+count(*)
+0
 set global innodb_encrypt_tables=OFF;
 set global debug_key_management_version=1;
diff --git a/mysql-test/suite/encryption/t/debug_key_management.test b/mysql-test/suite/encryption/t/debug_key_management.test
index b4dc8c41916..5001ac6a516 100644
--- a/mysql-test/suite/encryption/t/debug_key_management.test
+++ b/mysql-test/suite/encryption/t/debug_key_management.test
@@ -11,14 +11,15 @@ show variables like 'innodb_encrypt%';
 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;
+select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 1;
 set global debug_key_management_version=10;
 
 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;
+select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10;
 # Note that we expect that key_version is increasing so disable encryption before reset
+
 set global innodb_encrypt_tables=OFF;
 set global debug_key_management_version=1;