diff --git a/mysql-test/suite/innodb/t/innodb_scrub_background.opt b/mysql-test/suite/innodb/t/innodb_scrub_background.opt
index bb1f4ce4e86..cd5f74570bb 100644
--- a/mysql-test/suite/innodb/t/innodb_scrub_background.opt
+++ b/mysql-test/suite/innodb/t/innodb_scrub_background.opt
@@ -1,14 +1,7 @@
---innodb-file-per-table=1
---innodb-file-format=Barracuda
---innodb-encrypt-tables=0
---innodb-encryption-threads=0
---innodb-immediate-scrub-data-uncompressed=OFF
---innodb-background-scrub-data-uncompressed=ON
---innodb-background-scrub-data-compressed=ON
+--innodb_file_per_table=1 
+--innodb_file_format=Barracuda 
+--innodb-immediate-scrub-data-uncompressed=OFF 
+--innodb-background-scrub-data-uncompressed=ON 
+--innodb-background-scrub-data-compressed=ON 
 --loose-innodb-scrub-force-testing=ON
---encrypt-tmp-disk-tables=ON
---aria-encrypt-tables=ON
---innodb-encryption-threads=4
---innodb-encryption-rotate-key-age=15
---innodb-encrypt-tables=ON
---innodb-tablespaces-scrubbing
+--innodb-tablespaces_scrubbing
diff --git a/mysql-test/suite/innodb/t/innodb_scrub_compressed.opt b/mysql-test/suite/innodb/t/innodb_scrub_compressed.opt
index ac7ef8a1675..c94e9b34300 100644
--- a/mysql-test/suite/innodb/t/innodb_scrub_compressed.opt
+++ b/mysql-test/suite/innodb/t/innodb_scrub_compressed.opt
@@ -1,15 +1,7 @@
---innodb-file-per-table=1
---innodb-file-format=Barracuda
---innodb-encrypt-tables=off
---innodb-immediate-scrub-data-uncompressed=ON
---innodb-background-scrub-data-uncompressed=ON
---innodb-background-scrub-data-compressed=ON
---loose-innodb-scrub-force-testing=ON
---innodb-encryption-threads=0
---encrypt-tmp-disk-tables=ON
---aria-encrypt-tables=ON
---innodb-encryption-threads=4
---innodb-encryption-rotate-key-age=15
---innodb-encrypt-tables=ON
---innodb-tablespaces-scrubbing
-
+--innodb_file_per_table=1 
+--innodb_file_format=Barracuda 
+--innodb-immediate-scrub-data-uncompressed=ON 
+--innodb-background-scrub-data-uncompressed=ON 
+--innodb-background-scrub-data-compressed=ON 
+--loose-innodb-scrub-force-testing=ON 
+--innodb-tablespaces_scrubbing