diff --git a/unittest/libmariadb/charset.c b/unittest/libmariadb/charset.c
index f8a9cfc0..6424b94f 100644
--- a/unittest/libmariadb/charset.c
+++ b/unittest/libmariadb/charset.c
@@ -790,12 +790,13 @@ static int charset_auto(MYSQL *my __attribute__((unused)))
 /* check if all server character sets are supported */
 static int test_conc223(MYSQL *mysql)
 {
-  SKIP_MYSQL(mysql);
   int rc;
   MYSQL_RES *res;
   MYSQL_ROW row;
   int found= 0;
 
+  SKIP_MYSQL(mysql);
+
   rc= mysql_query(mysql, "SELECT ID, CHARACTER_SET_NAME, COLLATION_NAME FROM INFORMATION_SCHEMA.COLLATIONS");
   check_mysql_rc(rc, mysql);
 
diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c
index 875d7766..f05dff12 100644
--- a/unittest/libmariadb/connection.c
+++ b/unittest/libmariadb/connection.c
@@ -1723,7 +1723,7 @@ static int test_conc366(MYSQL *mysql)
   if (mysql_get_server_version(mysql) < 100400) {
     sprintf(query, "CREATE OR REPLACE USER 'ede'@'%s' IDENTIFIED VIA ed25519 USING '6aW9C7ENlasUfymtfMvMZZtnkCVlcb1ssxOLJ0kj/AA'", this_host);
   } else {
-    sprintf(query, "CREATE OR REPLACE USER 'ede'@'%s' IDENTIFIED VIA ed25519 USING PASSWORD('MySup8%rPassw@ord')", this_host);
+    sprintf(query, "CREATE OR REPLACE USER 'ede'@'%s' IDENTIFIED VIA ed25519 USING PASSWORD('MySup8%%rPassw@ord')", this_host);
   }
   rc= mysql_query(mysql, query);
   check_mysql_rc(rc, mysql);
@@ -1754,12 +1754,13 @@ static int test_conc366(MYSQL *mysql)
 
 static int test_conc392(MYSQL *mysql)
 {
-  SKIP_MYSQL(mysql);
   int rc;
   const char *data;
   size_t len;
   ulong capabilities= 0;
 
+  SKIP_MYSQL(mysql);
+
   mariadb_get_infov(mysql, MARIADB_CONNECTION_SERVER_CAPABILITIES, &capabilities);
   if (!(capabilities & CLIENT_SESSION_TRACKING))
   {
diff --git a/unittest/libmariadb/cursor.c b/unittest/libmariadb/cursor.c
index fd976c08..6378501a 100644
--- a/unittest/libmariadb/cursor.c
+++ b/unittest/libmariadb/cursor.c
@@ -283,11 +283,11 @@ static int test_cursors_with_union(MYSQL *mysql)
 
 static int test_cursors_with_procedure(MYSQL *mysql)
 {
-  SKIP_MYSQL(mysql);
   const char *queries[]=
   {
     "SELECT * FROM t1 procedure analyse()"
   };
+  SKIP_MYSQL(mysql);
   FAIL_IF(fetch_n(mysql, queries, sizeof(queries)/sizeof(*queries), USE_ROW_BY_ROW_FETCH), "fetch_n failed");
   FAIL_IF(fetch_n(mysql, queries, sizeof(queries)/sizeof(*queries), USE_STORE_RESULT), "fetch_n failed");
 
diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c
index c205a43a..07a4bac0 100644
--- a/unittest/libmariadb/ps_bugs.c
+++ b/unittest/libmariadb/ps_bugs.c
@@ -674,11 +674,11 @@ static int test_bug1500(MYSQL *mysql)
 
 static int test_bug15510(MYSQL *mysql)
 {
-  SKIP_MYSQL(mysql);
   MYSQL_STMT *stmt;
   int rc;
   const char *query= "select 1 from dual where 1/0";
 
+  SKIP_MYSQL(mysql);
 
   rc= mysql_query(mysql, "set @@sql_mode='ERROR_FOR_DIVISION_BY_ZERO'");
   check_mysql_rc(rc, mysql);