diff --git a/mysql-test/suite/jp/r/jp_convert_ucs2.result b/mysql-test/suite/jp/r/jp_convert_ucs2.result
index 842ddfa2ea7..d604d3d07f8 100644
--- a/mysql-test/suite/jp/r/jp_convert_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_convert_ucs2.result
@@ -7,6 +7,7 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
diff --git a/mysql-test/suite/jp/r/jp_convert_utf8.result b/mysql-test/suite/jp/r/jp_convert_utf8.result
index 74776c16ec2..7ee06341ba8 100644
--- a/mysql-test/suite/jp/r/jp_convert_utf8.result
+++ b/mysql-test/suite/jp/r/jp_convert_utf8.result
@@ -7,6 +7,7 @@ drop table if exists `锛达紪`;
 drop table if exists `锛达紬`;
 drop table if exists `锛达紭`;
 drop table if exists `锛达紮`;
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `锛达紤` (`锛ｏ紤` char(20), INDEX(`锛ｏ紤`)) DEFAULT CHARSET = utf8 engine = innodb;
diff --git a/mysql-test/suite/jp/r/jp_like_ucs2.result b/mysql-test/suite/jp/r/jp_like_ucs2.result
index 5b0f5171b94..438860be700 100644
--- a/mysql-test/suite/jp/r/jp_like_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_like_ucs2.result
@@ -7,6 +7,7 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
diff --git a/mysql-test/suite/jp/r/jp_like_utf8.result b/mysql-test/suite/jp/r/jp_like_utf8.result
index 2ac95ba4d6a..b3ea1aaff03 100644
--- a/mysql-test/suite/jp/r/jp_like_utf8.result
+++ b/mysql-test/suite/jp/r/jp_like_utf8.result
@@ -7,6 +7,7 @@ drop table if exists `锛达紪`;
 drop table if exists `锛达紬`;
 drop table if exists `锛达紭`;
 drop table if exists `锛达紮`;
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `锛达紤` (`锛ｏ紤` char(20), INDEX(`锛ｏ紤`)) DEFAULT CHARSET = utf8 engine = innodb;
diff --git a/mysql-test/suite/jp/r/jp_ltrim_ucs2.result b/mysql-test/suite/jp/r/jp_ltrim_ucs2.result
index c46e917c933..ad2faf51f42 100644
--- a/mysql-test/suite/jp/r/jp_ltrim_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_ltrim_ucs2.result
@@ -7,6 +7,7 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
diff --git a/mysql-test/suite/jp/r/jp_ltrim_utf8.result b/mysql-test/suite/jp/r/jp_ltrim_utf8.result
index 9ca8d61b050..6e4d2db3ea1 100644
--- a/mysql-test/suite/jp/r/jp_ltrim_utf8.result
+++ b/mysql-test/suite/jp/r/jp_ltrim_utf8.result
@@ -7,6 +7,7 @@ drop table if exists `锛达紪`;
 drop table if exists `锛达紬`;
 drop table if exists `锛达紭`;
 drop table if exists `锛达紮`;
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `锛达紤` (`锛ｏ紤` char(8), INDEX(`锛ｏ紤`)) DEFAULT CHARSET = utf8 engine = innodb;
diff --git a/mysql-test/suite/jp/r/jp_select_ucs2.result b/mysql-test/suite/jp/r/jp_select_ucs2.result
index a02cc2ead77..dbb6d942778 100644
--- a/mysql-test/suite/jp/r/jp_select_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_select_ucs2.result
@@ -7,6 +7,7 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
diff --git a/mysql-test/suite/jp/r/jp_select_utf8.result b/mysql-test/suite/jp/r/jp_select_utf8.result
index bc7b23cd51c..5680232da88 100644
--- a/mysql-test/suite/jp/r/jp_select_utf8.result
+++ b/mysql-test/suite/jp/r/jp_select_utf8.result
@@ -7,6 +7,7 @@ drop table if exists `锛达紪`;
 drop table if exists `锛达紬`;
 drop table if exists `锛达紭`;
 drop table if exists `锛达紮`;
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `锛达紤` (c1 char(20), INDEX(c1)) DEFAULT CHARSET = utf8 engine = innodb;
diff --git a/mysql-test/suite/jp/r/jp_where_ucs2.result b/mysql-test/suite/jp/r/jp_where_ucs2.result
index b581ba017a0..cacbc8fb594 100644
--- a/mysql-test/suite/jp/r/jp_where_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_where_ucs2.result
@@ -7,6 +7,7 @@ drop table if exists `
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
diff --git a/mysql-test/suite/jp/r/jp_where_utf8.result b/mysql-test/suite/jp/r/jp_where_utf8.result
index 3adb5733dbf..cafac700d86 100644
--- a/mysql-test/suite/jp/r/jp_where_utf8.result
+++ b/mysql-test/suite/jp/r/jp_where_utf8.result
@@ -7,6 +7,7 @@ drop table if exists `锛达紪`;
 drop table if exists `锛达紬`;
 drop table if exists `锛达紭`;
 drop table if exists `锛达紮`;
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 CREATE TABLE `锛达紤` (`锛ｏ紤` char(20), INDEX(`锛ｏ紤`)) DEFAULT CHARSET = utf8 engine = innodb;
diff --git a/mysql-test/suite/jp/t/jp_convert_ucs2.test b/mysql-test/suite/jp/t/jp_convert_ucs2.test
index cf79622373c..041c204eb22 100644
--- a/mysql-test/suite/jp/t/jp_convert_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_convert_ucs2.test
@@ -20,6 +20,7 @@ drop table if exists `
 # Test CONVERT() function with Japanese character in ucs2 encoding
 #
 
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
diff --git a/mysql-test/suite/jp/t/jp_convert_utf8.test b/mysql-test/suite/jp/t/jp_convert_utf8.test
index 7a230495e78..bff3ff8700b 100644
--- a/mysql-test/suite/jp/t/jp_convert_utf8.test
+++ b/mysql-test/suite/jp/t/jp_convert_utf8.test
@@ -19,6 +19,7 @@ drop table if exists `锛达紮`;
 # Test CONVERT() function with Japanese character in utf8 encoding
 #
 
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 
diff --git a/mysql-test/suite/jp/t/jp_like_ucs2.test b/mysql-test/suite/jp/t/jp_like_ucs2.test
index 1fd7d559e86..bfa9b84eab4 100644
--- a/mysql-test/suite/jp/t/jp_like_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_like_ucs2.test
@@ -17,6 +17,7 @@ drop table if exists `
 # Test LIKE pattern matching using Japanese characters in ucs2 encoding
 #
 
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
diff --git a/mysql-test/suite/jp/t/jp_like_utf8.test b/mysql-test/suite/jp/t/jp_like_utf8.test
index 4332922f831..16dd8060e67 100644
--- a/mysql-test/suite/jp/t/jp_like_utf8.test
+++ b/mysql-test/suite/jp/t/jp_like_utf8.test
@@ -16,6 +16,8 @@ drop table if exists `锛达紮`;
 # Test LIKE pattern matching using Japanese characters in utf8 encoding
 #
 
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
+
 SET NAMES utf8;
 SET character_set_database = utf8;
 
diff --git a/mysql-test/suite/jp/t/jp_ltrim_ucs2.test b/mysql-test/suite/jp/t/jp_ltrim_ucs2.test
index 65ea8d01610..4f90fbd419f 100644
--- a/mysql-test/suite/jp/t/jp_ltrim_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_ltrim_ucs2.test
@@ -17,6 +17,7 @@ drop table if exists `
 # Test LTRIM() function with Japanese characters in ucs2 encoding
 #
 
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
diff --git a/mysql-test/suite/jp/t/jp_ltrim_utf8.test b/mysql-test/suite/jp/t/jp_ltrim_utf8.test
index 3fcd5cbdc66..b7a27d3b3f2 100644
--- a/mysql-test/suite/jp/t/jp_ltrim_utf8.test
+++ b/mysql-test/suite/jp/t/jp_ltrim_utf8.test
@@ -16,6 +16,7 @@ drop table if exists `锛达紮`;
 # Test LTRIM() function with Japanese characters in utf8 encoding
 #
 
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 
diff --git a/mysql-test/suite/jp/t/jp_select_ucs2.test b/mysql-test/suite/jp/t/jp_select_ucs2.test
index 9acca2d6dfb..294743ae918 100644
--- a/mysql-test/suite/jp/t/jp_select_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_select_ucs2.test
@@ -17,6 +17,7 @@ drop table if exists `
 # Test Displaying Japanese charact in ucs2 encoding 
 #
 
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
diff --git a/mysql-test/suite/jp/t/jp_select_utf8.test b/mysql-test/suite/jp/t/jp_select_utf8.test
index 08157ccec11..55fc21bc0cf 100644
--- a/mysql-test/suite/jp/t/jp_select_utf8.test
+++ b/mysql-test/suite/jp/t/jp_select_utf8.test
@@ -16,6 +16,7 @@ drop table if exists `锛达紮`;
 # Test Displaying Japanese charact in utf8 encoding
 #
 
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;
 
diff --git a/mysql-test/suite/jp/t/jp_where_ucs2.test b/mysql-test/suite/jp/t/jp_where_ucs2.test
index 7e035cd28f3..88e058c57a3 100644
--- a/mysql-test/suite/jp/t/jp_where_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_where_ucs2.test
@@ -17,6 +17,7 @@ drop table if exists `
 # Test Displaying Japanese charact using WHERE condtion in ucs2 encoding
 #
 
+SET character_set_collations='ucs2=ucs2_general_ci';
 SET NAMES ujis;
 SET character_set_database = ucs2;
 SET collation_connection = ucs2_general_ci;
diff --git a/mysql-test/suite/jp/t/jp_where_utf8.test b/mysql-test/suite/jp/t/jp_where_utf8.test
index 97234ff15c5..2d6965d4f9e 100644
--- a/mysql-test/suite/jp/t/jp_where_utf8.test
+++ b/mysql-test/suite/jp/t/jp_where_utf8.test
@@ -16,6 +16,7 @@ drop table if exists `锛达紮`;
 # Test Displaying Japanese charact using WHERE condition in utf8 encoding
 #
 
+SET character_set_collations='utf8mb3=utf8mb3_general_ci';
 SET NAMES utf8;
 SET character_set_database = utf8;