diff --git a/mysql-test/suite/versioning/common.inc b/mysql-test/suite/versioning/common.inc
index aa3877d1570..13732146b64 100644
--- a/mysql-test/suite/versioning/common.inc
+++ b/mysql-test/suite/versioning/common.inc
@@ -22,18 +22,6 @@ begin
   from mysql.transaction_registry;
 end~~
 
-create function if not exists sys_commit_ts(sys_field varchar(255))
-returns varchar(255)
-deterministic
-begin
-  if @@default_storage_engine = 'InnoDB' then
-    return concat('vtq_commit_ts(', sys_field, ')');
-  elseif @@default_storage_engine = 'MyISAM' then
-    return sys_field;
-  end if;
-  return NULL;
-end~~
-
 create procedure if not exists verify_vtq_dummy(recs int)
 begin
   declare i int default 1;
@@ -46,19 +34,6 @@ begin
   drop table tmp;
 end~~
 
-create procedure concat_exec2(a varchar(255), b varchar(255))
-begin
-  prepare stmt from concat(a, b);
-  execute stmt;
-  deallocate prepare stmt;
-end~~
-
-create procedure concat_exec3(a varchar(255), b varchar(255), c varchar(255))
-begin
-  prepare stmt from concat(a, b, c);
-  execute stmt;
-  deallocate prepare stmt;
-end~~
 delimiter ;~~
 
 let $default_engine= `select @@default_storage_engine`;
diff --git a/mysql-test/suite/versioning/common_finish.inc b/mysql-test/suite/versioning/common_finish.inc
index d753fc138fb..5e4b5401e03 100644
--- a/mysql-test/suite/versioning/common_finish.inc
+++ b/mysql-test/suite/versioning/common_finish.inc
@@ -1,9 +1,6 @@
 --disable_query_log
 drop procedure verify_vtq;
 drop procedure verify_vtq_dummy;
-drop function sys_commit_ts;
-drop procedure concat_exec2;
-drop procedure concat_exec3;
 drop function current_row;
 drop function check_row;
 --enable_query_log