diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 010f467c4ad..77c8d9959e6 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -13617,12 +13617,12 @@ static void test_bug10214()
 static void test_client_character_set()
 {
   MY_CHARSET_INFO cs;
-  char *csname;
+  char *csname = (char*) "utf8";
+  char *csdefault = (char*)mysql_character_set_name(mysql);
   int rc;
 
   myheader("test_client_character_set");
 
-  csname= (char*) "utf8";
   rc= mysql_set_character_set(mysql, csname);
   DIE_UNLESS(rc == 0);
 
@@ -13630,7 +13630,7 @@ static void test_client_character_set()
   DIE_UNLESS(!strcmp(cs.csname, "utf8"));
   DIE_UNLESS(!strcmp(cs.name, "utf8_general_ci"));
   /* Restore the default character set */
-  rc= mysql_query(mysql, "set names default");
+  rc= mysql_set_character_set(mysql, csdefault);
   myquery(rc);
 }