diff --git a/include/sslopt-case.h b/include/sslopt-case.h
index 72881a266ab..11351247cd7 100644
--- a/include/sslopt-case.h
+++ b/include/sslopt-case.h
@@ -29,10 +29,15 @@
       One can disable SSL later by using --skip-ssl or --ssl=0
     */
       opt_use_ssl= 1;
-#if defined (HAVE_WOLFSSL) && (!defined (_WIN32) || defined (MYSQL_SERVER))
-      /* CRL does not work with WolfSSL */
+#if defined (HAVE_WOLFSSL)
+#if defined(MYSQL_SERVER)
+      /* CRL does not work with WolfSSL (server) */
       opt_ssl_crl= NULL;
+#endif
+#if !defined(_WIN32) || !defined(LIBMARIADB)
+      /* CRL_PATH does not work with WolfSSL (server) and GnuTLS (client) */
       opt_ssl_crlpath= NULL;
+#endif
 #endif
       break;
 #endif