diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 5fc027101aa..5bb7e420e1c 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -157,7 +157,7 @@ SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
 show create table t1;
 drop table t1;
---error 1284
+--error 1285
 SET SESSION table_type="gemini";
 SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
@@ -277,7 +277,7 @@ SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
 show create table t1;
 drop table t1;
---error 1284
+--error 1285
 SET SESSION table_type="gemini";
 SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 241e0c73931..b5c402fe962 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -124,7 +124,7 @@ set big_tables="OFFF";
 set unknown_variable=1;
 --error 1232
 set max_join_size="hello";
---error 1284
+--error 1285
 set table_type=UNKNOWN_TABLE_TYPE;
 --error 1231
 set table_type=INNODB, big_tables=2;