diff --git a/mysql-test/suite/versioning/common.inc b/mysql-test/suite/versioning/common.inc
index 3f508f9baf2..bc7a69b24e2 100644
--- a/mysql-test/suite/versioning/common.inc
+++ b/mysql-test/suite/versioning/common.inc
@@ -1,5 +1,5 @@
 --disable_query_log
---source suite/versioning/innodb.inc
+source include/have_innodb.inc;
 
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from mysql.transaction_registry;
diff --git a/mysql-test/suite/versioning/engines.inc b/mysql-test/suite/versioning/engines.inc
index a6213ecc437..c841fece702 100644
--- a/mysql-test/suite/versioning/engines.inc
+++ b/mysql-test/suite/versioning/engines.inc
@@ -1 +1 @@
---source suite/versioning/innodb.inc
+--source include/have_innodb.inc
diff --git a/mysql-test/suite/versioning/innodb.inc b/mysql-test/suite/versioning/innodb.inc
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/mysql-test/suite/versioning/innodb.opt b/mysql-test/suite/versioning/innodb.opt
deleted file mode 100644
index da687df2f0f..00000000000
--- a/mysql-test/suite/versioning/innodb.opt
+++ /dev/null
@@ -1,16 +0,0 @@
---innodb
---innodb-cmpmem
---innodb-cmp-per-index
---innodb-trx
---innodb-locks
---innodb-metrics
---innodb-buffer-pool-stats
---innodb-buffer-page
---innodb-buffer-page-lru
---innodb-sys-columns
---innodb-sys-fields
---innodb-sys-foreign
---innodb-sys-foreign-cols
---innodb-sys-indexes
---innodb-sys-tables
---innodb-sys-virtual