diff --git a/unittest/libmariadb/misc.c b/unittest/libmariadb/misc.c
index 496619da..d50db915 100644
--- a/unittest/libmariadb/misc.c
+++ b/unittest/libmariadb/misc.c
@@ -1063,7 +1063,11 @@ static int test_read_timeout(MYSQL *unused __attribute__((unused)))
 
   return OK;
 }
-#if __has_feature(memory_sanitizer)
+
+#ifndef __has_feature
+# define __has_feature(x) 0
+#endif
+#if !__has_feature(memory_sanitizer)
 #ifdef HAVE_REMOTEIO
 void *remote_plugin;
 static int test_remote1(MYSQL *mysql)
diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c
index 933a969e..fd5ac6c2 100644
--- a/unittest/libmariadb/ps_bugs.c
+++ b/unittest/libmariadb/ps_bugs.c
@@ -5407,6 +5407,9 @@ static int test_conc566(MYSQL *mysql)
   check_stmt_rc(rc, stmt);
 
   mysql_stmt_close(stmt);
+
+  rc= mysql_query(mysql,"drop procedure sp");
+  check_mysql_rc(rc, mysql);
   return OK;
 }