diff --git a/unittest/libmariadb/basic-t.c b/unittest/libmariadb/basic-t.c
index c22e6c2b..87bff9a9 100644
--- a/unittest/libmariadb/basic-t.c
+++ b/unittest/libmariadb/basic-t.c
@@ -310,7 +310,7 @@ static int use_utf8(MYSQL *my)
 
   while ((row= mysql_fetch_row(res)) != NULL)
   {
-    FAIL_IF(strcmp(row[0], "utf8"), "wrong character set");
+    FAIL_IF(strncmp(row[0], "utf8", 4), "wrong character set");
   }
   FAIL_IF(mysql_errno(my), mysql_error(my));
   mysql_free_result(res);
diff --git a/unittest/libmariadb/charset.c b/unittest/libmariadb/charset.c
index 898b6dad..e998f796 100644
--- a/unittest/libmariadb/charset.c
+++ b/unittest/libmariadb/charset.c
@@ -569,9 +569,9 @@ static int test_bug30472(MYSQL *mysql)
       2) new character set is different from the original one.
   */
 
-  FAIL_UNLESS(strcmp(character_set_name_2, "utf8") == 0, "cs_name != utf8");
-  FAIL_UNLESS(strcmp(character_set_client_2, "utf8") == 0, "cs_client != utf8");
-  FAIL_UNLESS(strcmp(character_set_results_2, "utf8") == 0, "cs_result != ut8");
+  FAIL_UNLESS(strncmp(character_set_name_2, "utf8", 4) == 0, "cs_name != utf8");
+  FAIL_UNLESS(strncmp(character_set_client_2, "utf8", 4) == 0, "cs_client != utf8");
+  FAIL_UNLESS(strncmp(character_set_results_2, "utf8", 4) == 0, "cs_result != ut8");
   FAIL_UNLESS(strcmp(collation_connnection_2, "utf8_general_ci") == 0, "collation != utf8_general_ci");
 
   diag("%s %s", character_set_name_1, character_set_name_2);
diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c
index 0da10cbe..b0381baf 100644
--- a/unittest/libmariadb/connection.c
+++ b/unittest/libmariadb/connection.c
@@ -981,7 +981,7 @@ static int test_sess_track_db(MYSQL *mysql)
       printf("# SESSION_TRACK_VARIABLES: %*.*s\n", (int)len, (int)len, data);
     } while (!mysql_session_track_get_next(mysql, SESSION_TRACK_SYSTEM_VARIABLES, &data, &len));
     diag("charset: %s", mysql->charset->csname);
-    FAIL_IF(strcmp(mysql->charset->csname, "utf8"), "Expected charset 'utf8'");
+    FAIL_IF(strncmp(mysql->charset->csname, "utf8", 4), "Expected charset 'utf8'");
 
     rc= mysql_query(mysql, "SET NAMES latin1");
     check_mysql_rc(rc, mysql);