diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c
index 7c3a8256..5a099d44 100644
--- a/unittest/libmariadb/connection.c
+++ b/unittest/libmariadb/connection.c
@@ -1208,6 +1208,7 @@ static int test_auth256(MYSQL *my)
   if (!my_test_connect(mysql, hostname, "sha256user", "foo", NULL, port, socketname, 0))
   {
     diag("error: %s", mysql_error(mysql));
+    diag("host: %s", this_host);
     mysql_close(mysql);
     return FAIL;
   }
@@ -1940,7 +1941,9 @@ static int test_conc632(MYSQL *my __attribute__((unused)))
     return FAIL;
   }
 
-  rc= mysql_query(mysql, "CREATE OR REPLACE PROCEDURE conc632() "
+  rc= mysql_query(mysql, "DROP PROCEDURE conc632");
+
+  rc= mysql_query(mysql, "CREATE PROCEDURE conc632() "
                          "BEGIN "
                          "  SELECT 1;"
                          "  SELECT 2;"
diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c
index e04330da..15c52501 100644
--- a/unittest/libmariadb/ps_bugs.c
+++ b/unittest/libmariadb/ps_bugs.c
@@ -5489,9 +5489,13 @@ static int test_mdev19838(MYSQL *mysql)
 
 static int test_conc627(MYSQL *mysql)
 {
-  MYSQL_STMT *stmt= mysql_stmt_init(mysql);
+  MYSQL_STMT *stmt;
   int rc;
 
+  SKIP_MYSQL(mysql);
+
+  stmt= mysql_stmt_init(mysql);
+
   rc= mysql_stmt_prepare(stmt, SL("show grants for mysqltest_8"));
   check_stmt_rc(rc, stmt);