diff --git a/unittest/libmariadb/misc.c b/unittest/libmariadb/misc.c
index 3ad4d4a8..579ab8bb 100644
--- a/unittest/libmariadb/misc.c
+++ b/unittest/libmariadb/misc.c
@@ -244,6 +244,7 @@ static int test_frm_bug(MYSQL *mysql)
   int        rc;
 
   SKIP_MYSQL(mysql);
+  SKIP_XPAND;
 
   mysql_autocommit(mysql, TRUE);
 
@@ -622,6 +623,8 @@ static int test_wl4166_4(MYSQL *mysql)
   char buf1[16], buf2[16];
   ulong buf1_len, buf2_len;
 
+  SKIP_XPAND;
+
   if (mysql_get_server_version(mysql) < 50100) {
     diag("Test requires MySQL Server version 5.1 or above");
     return SKIP;