diff --git a/mysql-test/suite/versioning/r/alter.result b/mysql-test/suite/versioning/r/alter.result
index d656c8ee46d..b3627544595 100644
--- a/mysql-test/suite/versioning/r/alter.result
+++ b/mysql-test/suite/versioning/r/alter.result
@@ -450,5 +450,20 @@ alter table t drop column a;
 ERROR HY000: Table `t` must have at least one versioned column
 alter table t drop column a, drop column a;
 ERROR 42000: Can't DROP COLUMN `a`; check that it exists
+create or replace table t1 (sys_trx_start int);
+alter table t1 with system versioning;
+ERROR 42S21: Duplicate column name 'sys_trx_start'
+create or replace table t1 (sys_trx_end int);
+alter table t1 with system versioning;
+ERROR 42S21: Duplicate column name 'sys_trx_end'
+create or replace table t1 (a int, sys_trx_start int) with system versioning;
+ERROR 42S21: Duplicate column name 'sys_trx_start'
+create or replace table t1 (a int) with system versioning;
+set statement system_versioning_alter_history=keep for
+alter table t1 add column sys_trx_start int;
+ERROR 42S21: Duplicate column name 'sys_trx_start'
+set statement system_versioning_alter_history=keep for
+alter table t1 add column sys_trx_start timestamp(6);
+ERROR 42S21: Duplicate column name 'sys_trx_start'
 drop database test;
 create database test;
diff --git a/mysql-test/suite/versioning/r/create.result b/mysql-test/suite/versioning/r/create.result
index 01dba9526b8..42000700a0c 100644
--- a/mysql-test/suite/versioning/r/create.result
+++ b/mysql-test/suite/versioning/r/create.result
@@ -341,12 +341,6 @@ t3	CREATE TABLE `t3` (
   `x27` int(11) DEFAULT NULL
 ) ENGINE=NON_DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
 ## Errors
-create or replace table t (sys_trx_start int);
-alter table t with system versioning;
-ERROR 42S21: Duplicate column name 'sys_trx_start'
-create or replace table t (sys_trx_end int);
-alter table t with system versioning;
-ERROR 42S21: Duplicate column name 'sys_trx_end'
 create or replace temporary table t (x28 int) with system versioning;
 ERROR HY000: System versioning prohibited for TEMPORARY tables
 create or replace table t1 (
diff --git a/mysql-test/suite/versioning/t/alter.test b/mysql-test/suite/versioning/t/alter.test
index e79635c2bec..a9ac971c1f7 100644
--- a/mysql-test/suite/versioning/t/alter.test
+++ b/mysql-test/suite/versioning/t/alter.test
@@ -383,6 +383,26 @@ alter table t drop column a;
 --error ER_CANT_DROP_FIELD_OR_KEY
 alter table t drop column a, drop column a;
 
+create or replace table t1 (sys_trx_start int);
+--error ER_DUP_FIELDNAME
+alter table t1 with system versioning;
+
+create or replace table t1 (sys_trx_end int);
+--error ER_DUP_FIELDNAME
+alter table t1 with system versioning;
+
+--error ER_DUP_FIELDNAME
+create or replace table t1 (a int, sys_trx_start int) with system versioning;
+
+create or replace table t1 (a int) with system versioning;
+
+--error ER_DUP_FIELDNAME
+set statement system_versioning_alter_history=keep for
+alter table t1 add column sys_trx_start int;
+
+--error ER_DUP_FIELDNAME
+set statement system_versioning_alter_history=keep for
+alter table t1 add column sys_trx_start timestamp(6);
 
 drop database test;
 create database test;
diff --git a/mysql-test/suite/versioning/t/create.test b/mysql-test/suite/versioning/t/create.test
index 5d5f62c9368..0dad0193695 100644
--- a/mysql-test/suite/versioning/t/create.test
+++ b/mysql-test/suite/versioning/t/create.test
@@ -306,13 +306,6 @@ as select t2.b, t1.x27, t1.sys_trx_start, t1.sys_trx_end from t2 inner join t1 o
 show create table t3;
 
 --echo ## Errors
-create or replace table t (sys_trx_start int);
---error ER_DUP_FIELDNAME
-alter table t with system versioning;
-
-create or replace table t (sys_trx_end int);
---error ER_DUP_FIELDNAME
-alter table t with system versioning;
 
 --error ER_VERS_TEMPORARY
 create or replace temporary table t (x28 int) with system versioning;