diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result
index e572eb2e785..eba177460ed 100644
--- a/mysql-test/suite/versioning/r/partition.result
+++ b/mysql-test/suite/versioning/r/partition.result
@@ -1,3 +1,4 @@
+set system_versioning_alter_history=keep;
 # Check conventional partitioning on temporal tables
 create table t1 (x int)
 with system versioning
diff --git a/mysql-test/suite/versioning/t/partition.opt b/mysql-test/suite/versioning/t/partition.opt
deleted file mode 100644
index 71be6744916..00000000000
--- a/mysql-test/suite/versioning/t/partition.opt
+++ /dev/null
@@ -1 +0,0 @@
---system-versioning-alter-history=keep
diff --git a/mysql-test/suite/versioning/t/partition.test b/mysql-test/suite/versioning/t/partition.test
index d16bb4abc5c..c2f98cb304f 100644
--- a/mysql-test/suite/versioning/t/partition.test
+++ b/mysql-test/suite/versioning/t/partition.test
@@ -1,6 +1,7 @@
 -- source include/have_partition.inc
 -- source suite/versioning/common.inc
 
+set system_versioning_alter_history=keep;
 --echo # Check conventional partitioning on temporal tables
 
 create table t1 (x int)
diff --git a/mysql-test/suite/versioning/t/truncate.opt b/mysql-test/suite/versioning/t/truncate.opt
deleted file mode 100644
index b0c5b9c8188..00000000000
--- a/mysql-test/suite/versioning/t/truncate.opt
+++ /dev/null
@@ -1 +0,0 @@
---partition
diff --git a/mysql-test/suite/versioning/t/truncate.test b/mysql-test/suite/versioning/t/truncate.test
index 7376a15ca0f..c0b7f62348d 100644
--- a/mysql-test/suite/versioning/t/truncate.test
+++ b/mysql-test/suite/versioning/t/truncate.test
@@ -1,3 +1,4 @@
+--source include/have_partition.inc
 --source suite/versioning/engines.inc
 
 create table t (a int);
diff --git a/mysql-test/suite/versioning/t/vtmd.opt b/mysql-test/suite/versioning/t/vtmd.opt
deleted file mode 100644
index 3596fc4d3bd..00000000000
--- a/mysql-test/suite/versioning/t/vtmd.opt
+++ /dev/null
@@ -1 +0,0 @@
---innodb --default-storage-engine=innodb
diff --git a/mysql-test/suite/versioning/t/vtmd.test b/mysql-test/suite/versioning/t/vtmd.test
index 56bdb3d2546..dcb39a332fc 100644
--- a/mysql-test/suite/versioning/t/vtmd.test
+++ b/mysql-test/suite/versioning/t/vtmd.test
@@ -1,4 +1,6 @@
 -- source include/have_innodb.inc
+set default_storage_engine=innodb;
+
 delimiter ~~;
 create or replace procedure drop_archives (in vtmd_name varchar(64))
 begin
diff --git a/mysql-test/suite/versioning/t/vtmd_show.opt b/mysql-test/suite/versioning/t/vtmd_show.opt
deleted file mode 100644
index 627becdbfb5..00000000000
--- a/mysql-test/suite/versioning/t/vtmd_show.opt
+++ /dev/null
@@ -1 +0,0 @@
---innodb
diff --git a/mysql-test/suite/versioning/t/vtmd_show.test b/mysql-test/suite/versioning/t/vtmd_show.test
index 4397198c839..b740ba43ea1 100644
--- a/mysql-test/suite/versioning/t/vtmd_show.test
+++ b/mysql-test/suite/versioning/t/vtmd_show.test
@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+
 delimiter ~~;
 create or replace procedure drop_archives (in vtmd_name varchar(64))
 begin