diff --git a/mysql-test/suite/versioning/r/cte.result b/mysql-test/suite/versioning/r/cte.result
index 3345ce7a7ae..12532041857 100644
--- a/mysql-test/suite/versioning/r/cte.result
+++ b/mysql-test/suite/versioning/r/cte.result
@@ -1,3 +1,4 @@
+set default_storage_engine=innodb;
 create or replace table dept (
 dept_id int(10) primary key, 
 name varchar(100)
diff --git a/mysql-test/suite/versioning/r/simple.result b/mysql-test/suite/versioning/r/simple.result
index 9b34868aa67..8f5fd57ea4b 100644
--- a/mysql-test/suite/versioning/r/simple.result
+++ b/mysql-test/suite/versioning/r/simple.result
@@ -1,3 +1,4 @@
+set default_storage_engine=innodb;
 create or replace table dept (
 dept_id int(10) primary key, 
 name varchar(100)
diff --git a/mysql-test/suite/versioning/t/cte.opt b/mysql-test/suite/versioning/t/cte.opt
index 36f683f4f5b..e5abd94afeb 100644
--- a/mysql-test/suite/versioning/t/cte.opt
+++ b/mysql-test/suite/versioning/t/cte.opt
@@ -1,3 +1,2 @@
---innodb --default-storage-engine=innodb
 --plugin-load=versioning
 --versioning-hide=implicit
diff --git a/mysql-test/suite/versioning/t/cte.test b/mysql-test/suite/versioning/t/cte.test
index 4b406f721b4..084b4feec57 100644
--- a/mysql-test/suite/versioning/t/cte.test
+++ b/mysql-test/suite/versioning/t/cte.test
@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+set default_storage_engine=innodb;
 create or replace table dept (
   dept_id int(10) primary key, 
   name varchar(100)
diff --git a/mysql-test/suite/versioning/t/simple.opt b/mysql-test/suite/versioning/t/simple.opt
index 993df05011e..a0dbb2d9e7a 100644
--- a/mysql-test/suite/versioning/t/simple.opt
+++ b/mysql-test/suite/versioning/t/simple.opt
@@ -1,2 +1 @@
---innodb --default-storage-engine=innodb
 --plugin-load=versioning
diff --git a/mysql-test/suite/versioning/t/simple.test b/mysql-test/suite/versioning/t/simple.test
index a594162c3b5..5cda9380153 100644
--- a/mysql-test/suite/versioning/t/simple.test
+++ b/mysql-test/suite/versioning/t/simple.test
@@ -1,3 +1,5 @@
+-- source include/have_innodb.inc
+set default_storage_engine=innodb;
 create or replace table dept (
   dept_id int(10) primary key, 
   name varchar(100)