diff --git a/unittest/libmariadb/async.c b/unittest/libmariadb/async.c
index bc6beaff..e9e3c6f0 100644
--- a/unittest/libmariadb/async.c
+++ b/unittest/libmariadb/async.c
@@ -156,6 +156,7 @@ static int async1(MYSQL *unused __attribute__((unused)))
     mysql_options(&mysql, MYSQL_OPT_CONNECT_TIMEOUT, &default_timeout);
     mysql_options(&mysql, MYSQL_OPT_WRITE_TIMEOUT, &default_timeout);
     mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, "myapp");
+    mysql_options(&mysql, MARIADB_OPT_SSL_FP, fingerprint);
     if (force_tls)
       mysql_ssl_set(&mysql, NULL, NULL, NULL, NULL,NULL);
 
diff --git a/unittest/libmariadb/conc336.c b/unittest/libmariadb/conc336.c
index 3d1f47b5..746d574c 100644
--- a/unittest/libmariadb/conc336.c
+++ b/unittest/libmariadb/conc336.c
@@ -6,6 +6,7 @@ int main(int argc, char *argv[]) {
 
 	MYSQL *mysql;
 	int i;
+  my_bool verify=0;
 
   if (argc > 1)
     get_options(argc, argv);
@@ -38,6 +39,7 @@ int main(int argc, char *argv[]) {
 
     if (force_tls)
       mysql_options(mysql, MYSQL_OPT_SSL_ENFORCE, &force_tls);
+    mysql_optionsv(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &verify);
 
 		if (!mysql_real_connect(mysql, hostname, username, password, schema, port, socketname, 0)) {
 			diag("mysql_real_connect failed: %s", mysql_error(mysql));
diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c
index bd4e0e0a..cacf84bb 100644
--- a/unittest/libmariadb/connection.c
+++ b/unittest/libmariadb/connection.c
@@ -2008,10 +2008,11 @@ static int test_conn_str(MYSQL *my __attribute__((unused)))
   char conn_str[1024];
   int rc=OK;
 
-  snprintf(conn_str, sizeof(conn_str)-1, "host=%s;user=%s;password={%s};port=%d;socket=%s",
+  snprintf(conn_str, sizeof(conn_str)-1, "host=%s;user=%s;password={%s};port=%d;socket=%s;tls_fp=%s",
                 hostname ? hostname : "localhost", username ? username : "", 
                 password ? password : "", 
-                port, socketname ? socketname : "");
+                port, socketname ? socketname : "",
+                fingerprint[0] ? fingerprint : "");
 
   /* SkySQL requires secure connection */
   if (IS_SKYSQL(hostname))
@@ -2083,9 +2084,9 @@ static int test_conc365(MYSQL *my __attribute__((unused)))
   char tmp[1024];
 
   snprintf(tmp, sizeof(tmp) - 1,
-   "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s",
+   "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s;tls_fp=%s",
    hostname ? hostname : "localhost", username ? username : "", password ? password : "",
-   port, socketname ? socketname : "");
+   port, socketname ? socketname : "", fingerprint[0] ? fingerprint : "");
 
  if (IS_SKYSQL(hostname))
    strcat(tmp, ";ssl_enforce=1");
@@ -2131,6 +2132,7 @@ static int test_conc365_reconnect(MYSQL *my)
   MYSQL *mysql= mysql_init(NULL);
   char tmp[1024];
   my_bool reconnect= 1;
+
   SKIP_MAXSCALE;
 
   mysql_options(mysql, MYSQL_OPT_RECONNECT, &reconnect);
@@ -2138,14 +2140,14 @@ static int test_conc365_reconnect(MYSQL *my)
   if (IS_SKYSQL(hostname))
   {
     snprintf(tmp, sizeof(tmp) - 1,
-      "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s;ssl_enforce=1",
+      "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s;ssl_enforce=1;tls_fp=%s",
       hostname ? hostname : "localhost", username ? username : "", password ? password : "",
-      ssl_port, socketname ? socketname : "");
+      ssl_port, socketname ? socketname : "", fingerprint[0] ? fingerprint : "");
   } else {
     snprintf(tmp, sizeof(tmp) - 1,
-      "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s",
+      "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s;tls_fp=%s",
       hostname ? hostname : "localhost", username ? username : "", password ? password : "",
-      port, socketname ? socketname : "");
+      port, socketname ? socketname : "", fingerprint[0] ? fingerprint :"");
   }
 
   if (!my_test_connect(mysql, tmp, username,
diff --git a/unittest/libmariadb/misc.c b/unittest/libmariadb/misc.c
index 47f2f523..16609c4e 100644
--- a/unittest/libmariadb/misc.c
+++ b/unittest/libmariadb/misc.c
@@ -1638,6 +1638,7 @@ static int test_disable_tls1_0(MYSQL *my __attribute__((unused)))
 
   mysql_ssl_set(mysql, NULL, NULL, NULL, NULL, NULL);
   mysql_optionsv(mysql, MARIADB_OPT_TLS_VERSION, disabled_version);
+  mysql_optionsv(mysql, MARIADB_OPT_SSL_FP, fingerprint);
 
   FAIL_IF(!mysql_real_connect(mysql, hostname, username, password, schema,
                          port, socketname, 0), mysql_error(mysql));
diff --git a/unittest/libmariadb/my_test.h b/unittest/libmariadb/my_test.h
index 3184b80d..c0024738 100644
--- a/unittest/libmariadb/my_test.h
+++ b/unittest/libmariadb/my_test.h
@@ -224,7 +224,7 @@ MYSQL *my_test_connect(MYSQL *mysql,
 static const char *schema = 0;
 static char *hostname = 0;
 static char *password = 0;
-static char fingerprint[65];
+static char fingerprint[65]= {0};
 static unsigned int port = 0;
 static unsigned int ssl_port = 0;
 static char *socketname = 0;