diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result
index d11d25f9b35..6182bd0f598 100644
--- a/mysql-test/r/ctype_ucs.result
+++ b/mysql-test/r/ctype_ucs.result
@@ -719,3 +719,11 @@ lily
 river
 drop table t1;
 deallocate prepare stmt;
+create table t1(a blob, b text charset utf8, c text charset ucs2);
+select data_type, character_octet_length, character_maximum_length
+from information_schema.columns where table_name='t1';
+data_type	character_octet_length	character_maximum_length
+blob	65535	65535
+text	65535	65535
+text	65535	32767
+drop table t1;
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 770d9265830..d5fb046d319 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -1041,14 +1041,6 @@ select 1 from (select 1 from test.t1) a;
 1
 use test;
 drop table t1;
-create table t1(a blob, b text charset utf8, c text charset ucs2);
-select data_type, character_octet_length, character_maximum_length 
-from information_schema.columns where table_name='t1';
-data_type	character_octet_length	character_maximum_length
-blob	65535	65535
-text	65535	65535
-text	65535	32767
-drop table t1;
 create table t1 (f1 int(11));
 create view v1 as select * from t1;
 drop table t1;
diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test
index d4ea8dd57ad..af46b9c385a 100644
--- a/mysql-test/t/ctype_ucs.test
+++ b/mysql-test/t/ctype_ucs.test
@@ -455,3 +455,11 @@ execute stmt using @param1;
 select utext from t1 where utext like '%%';
 drop table t1;
 deallocate prepare stmt;
+
+#
+# Bug #14290: character_maximum_length for text fields
+#
+create table t1(a blob, b text charset utf8, c text charset ucs2);
+select data_type, character_octet_length, character_maximum_length
+  from information_schema.columns where table_name='t1';
+drop table t1;
diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
index 6957dcf3b6a..47f262a9d59 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -738,15 +738,6 @@ select 1 from (select 1 from test.t1) a;
 use test;
 drop table t1;
 
-#
-# Bug #14290: character_maximum_length for text fields
-#
-
-create table t1(a blob, b text charset utf8, c text charset ucs2);
-select data_type, character_octet_length, character_maximum_length 
-  from information_schema.columns where table_name='t1';
-drop table t1;
-
 #
 # Bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
 #