diff --git a/storage/rocksdb/mysql-test/rocksdb/my.cnf b/storage/rocksdb/mysql-test/rocksdb/my.cnf
index 2ed68088259..b006f63bf0c 100644
--- a/storage/rocksdb/mysql-test/rocksdb/my.cnf
+++ b/storage/rocksdb/mysql-test/rocksdb/my.cnf
@@ -1,6 +1,12 @@
 !include include/default_my.cnf
 
 [server]
+rocksdb
+skip-innodb
+default-storage-engine=rocksdb
+
+ignore-db-dirs=.rocksdb
+
 sql-mode=NO_ENGINE_SUBSTITUTION
 explicit-defaults-for-timestamp=1
 rocksdb_lock_wait_timeout=1
diff --git a/storage/rocksdb/mysql-test/rocksdb/suite.opt b/storage/rocksdb/mysql-test/rocksdb/suite.opt
deleted file mode 100644
index 4942baf3b85..00000000000
--- a/storage/rocksdb/mysql-test/rocksdb/suite.opt
+++ /dev/null
@@ -1 +0,0 @@
---ignore-db-dirs=.rocksdb