diff --git a/unittest/libmariadb/ssl.c.in b/unittest/libmariadb/ssl.c.in
index b4314a27..6dd4ed85 100644
--- a/unittest/libmariadb/ssl.c.in
+++ b/unittest/libmariadb/ssl.c.in
@@ -117,6 +117,8 @@ static int test_ssl(MYSQL *mysql)
 
   mysql_ssl_set(my,0, 0, 0, 0, 0);
 
+  create_ssl_user("ssluser", 0);
+
   FAIL_IF(!mysql_real_connect(my, hostname, ssluser, sslpw, schema,
                          port, socketname, 0), mysql_error(my));
 
@@ -1255,6 +1257,11 @@ static int test_mdev14101(MYSQL *my __attribute__((unused)))
   bool skip_tlsv12= !have_openssl;
 #endif
 
+#if defined(HAVE_OPENSSL) && defined(TLS1_3_VERSION)
+  diag("Test fails with TLS v1.3");
+  return(SKIP);
+#endif
+
   for (i=0; combinations[i].expected; i++)
   {
     MYSQL *mysql;