diff --git a/mysql-test/suite/encryption/r/create_or_replace.result b/mysql-test/suite/encryption/r/create_or_replace_big.result
similarity index 82%
rename from mysql-test/suite/encryption/r/create_or_replace.result
rename to mysql-test/suite/encryption/r/create_or_replace_big.result
index 1671043b50d..87f56cc3e2c 100644
--- a/mysql-test/suite/encryption/r/create_or_replace.result
+++ b/mysql-test/suite/encryption/r/create_or_replace_big.result
@@ -12,15 +12,8 @@ INSERT /*! IGNORE */ INTO table1_int_autoinc VALUES  (4, NULL, NULL);
 INSERT IGNORE INTO `table0_int_autoinc` ( `col_int_key` ) VALUES ( 1 ), ( 3 ), ( 4 ), ( 1 );
 INSERT IGNORE INTO `table1_int_autoinc` ( `col_int` ) VALUES ( 1 ), ( 0 ), ( 7 ), ( 9 );
 INSERT IGNORE INTO `table10_int_autoinc` ( `col_int` ) VALUES ( 6 ), ( 2 ), ( 3 ), ( 6 );
-connect  con1,localhost,root,,test;
-connect  con2,localhost,root,,test;
-connection default;
-drop table if exists create_or_replace_t, table1_int_autoinc, table0_int_autoinc, table10_int_autoinc;
-disconnect con1;
-disconnect con2;
-SET GLOBAL innodb_encrypt_tables = OFF;
-SET GLOBAL innodb_encryption_threads = 4;
 # Wait max 10 min for key encryption threads to decrypt all spaces
 # Success!
 SET GLOBAL innodb_encryption_threads = 0;
 SET GLOBAL innodb_encrypt_tables = OFF;
+DROP TABLE table0_int_autoinc, table1_int_autoinc, table10_int_autoinc;
diff --git a/mysql-test/suite/encryption/t/create_or_replace.opt b/mysql-test/suite/encryption/t/create_or_replace_big.opt
similarity index 100%
rename from mysql-test/suite/encryption/t/create_or_replace.opt
rename to mysql-test/suite/encryption/t/create_or_replace_big.opt
diff --git a/mysql-test/suite/encryption/t/create_or_replace.test b/mysql-test/suite/encryption/t/create_or_replace_big.test
similarity index 63%
rename from mysql-test/suite/encryption/t/create_or_replace.test
rename to mysql-test/suite/encryption/t/create_or_replace_big.test
index 3b2970e5162..133bdfa3cb2 100644
--- a/mysql-test/suite/encryption/t/create_or_replace.test
+++ b/mysql-test/suite/encryption/t/create_or_replace_big.test
@@ -55,62 +55,6 @@ INSERT IGNORE INTO `table0_int_autoinc` ( `col_int_key` ) VALUES ( 1 ), ( 3 ), (
 INSERT IGNORE INTO `table1_int_autoinc` ( `col_int` ) VALUES ( 1 ), ( 0 ), ( 7 ), ( 9 );
 INSERT IGNORE INTO `table10_int_autoinc` ( `col_int` ) VALUES ( 6 ), ( 2 ), ( 3 ), ( 6 );
 
---connect (con1,localhost,root,,test)
---connect (con2,localhost,root,,test)
-
---disable_abort_on_error
---disable_warnings
---disable_query_log
-
-let $i = 500;
-while ($i)
-{
-connection con1;
-send SET GLOBAL innodb_encrypt_tables = ON;
-connection default;
-CREATE OR REPLACE TABLE `create_or_replace_t` AS SELECT * FROM `table1_int_autoinc`;
-connection con2;
-send CREATE OR REPLACE TABLE `create_or_replace_t` AS SELECT * FROM `table10_int_autoinc`;
-connection default;
-send CREATE OR REPLACE TABLE `create_or_replace_t` AS SELECT * FROM `table0_int_autoinc`;
-connection con1;
---reap;
-send SET GLOBAL innodb_encrypt_tables = OFF;
-connection con2;
---reap;
-connection default;
---reap;
-send CREATE OR REPLACE TABLE `create_or_replace_t` AS SELECT * FROM `table1_int_autoinc`;
-connection con2;
-send CREATE OR REPLACE TABLE `create_or_replace_t` AS SELECT * FROM `table10_int_autoinc`;
-connection con1;
---reap;
-send SET GLOBAL innodb_encrypt_tables = ON;
-connection default;
---reap;
-send CREATE OR REPLACE TABLE `create_or_replace_t` AS SELECT * FROM `table1_int_autoinc`;
-connection con2;
---reap;
-CREATE OR REPLACE TABLE `create_or_replace_t` AS SELECT * FROM `table10_int_autoinc`;
-CREATE OR REPLACE TABLE `create_or_replace_t` AS SELECT * FROM `table0_int_autoinc`;
-connection con1;
---reap;
-connection default;
---reap;
-dec $i;
-}
-
---enable_query_log
-connection default;
-drop table if exists create_or_replace_t, table1_int_autoinc, table0_int_autoinc, table10_int_autoinc;
---disconnect con1
---disconnect con2
---enable_abort_on_error
---enable_warnings
-
-SET GLOBAL innodb_encrypt_tables = OFF;
-SET GLOBAL innodb_encryption_threads = 4;
-
 --echo # Wait max 10 min for key encryption threads to decrypt all spaces
 let $cnt=600;
 while ($cnt)
@@ -137,6 +81,6 @@ if (!$success)
 SET GLOBAL innodb_encryption_threads = 0;
 SET GLOBAL innodb_encrypt_tables = OFF;
 
-# Make sure that all dirty pages are flushed
+DROP TABLE table0_int_autoinc, table1_int_autoinc, table10_int_autoinc;
 
 -- source include/restart_mysqld.inc