diff --git a/mysql-test/suite/encryption/r/debug_key_management.result b/mysql-test/suite/encryption/r/debug_key_management.result
index 45d629e52e6..8793e6ba363 100644
--- a/mysql-test/suite/encryption/r/debug_key_management.result
+++ b/mysql-test/suite/encryption/r/debug_key_management.result
@@ -1,3 +1,4 @@
+set global innodb_encrypt_tables=ON;
 show variables like 'innodb_encrypt%';
 Variable_name	Value
 innodb_encrypt_log	ON
@@ -16,4 +17,5 @@ space	name	current_key_version
 0	NULL	10
 1	mysql/innodb_table_stats	10
 2	mysql/innodb_index_stats	10
+set global innodb_encrypt_tables=OFF;
 set global debug_key_management_version=1;
diff --git a/mysql-test/suite/encryption/t/debug_key_management.opt b/mysql-test/suite/encryption/t/debug_key_management.opt
index 722d4676594..5c283bbeda2 100644
--- a/mysql-test/suite/encryption/t/debug_key_management.opt
+++ b/mysql-test/suite/encryption/t/debug_key_management.opt
@@ -1,4 +1,3 @@
---innodb-encrypt-tables=ON
 --innodb-encrypt-log=ON
 --innodb-encryption-rotate-key-age=2
 --innodb-encryption-threads=4
diff --git a/mysql-test/suite/encryption/t/debug_key_management.test b/mysql-test/suite/encryption/t/debug_key_management.test
index f733d6ec91c..b4dc8c41916 100644
--- a/mysql-test/suite/encryption/t/debug_key_management.test
+++ b/mysql-test/suite/encryption/t/debug_key_management.test
@@ -5,6 +5,7 @@ if (`select count(*) = 0 from information_schema.plugins
   --skip Needs debug_key_management
 }
 
+set global innodb_encrypt_tables=ON;
 show variables like 'innodb_encrypt%';
 
 let $wait_condition= select count(*) = 3 from information_schema.innodb_tablespaces_encryption where current_key_version=1;
@@ -17,5 +18,7 @@ let $wait_condition= select count(*) = 3 from information_schema.innodb_tablespa
 --source include/wait_condition.inc
 
 select space,name,current_key_version from information_schema.innodb_tablespaces_encryption order by space;
+# 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;