diff --git a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in
index ef478d94..262f38ee 100644
--- a/mariadb_config/mariadb_config.c.in
+++ b/mariadb_config/mariadb_config.c.in
@@ -36,7 +36,7 @@ static char *mariadb_progname;
 #define PLUGIN_DIR "%s/@INSTALL_PLUGINDIR@"
 #define SOCKET  "@MARIADB_UNIX_ADDR@"
 #define PORT "@MARIADB_PORT@"
-#ifdef HAVE_SSL
+#ifdef HAVE_TLS
 #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@"
 #else
 #define TLS_LIBRARY_VERSION ""
diff --git a/unittest/libmariadb/misc.c b/unittest/libmariadb/misc.c
index d8e36370..9a2515e0 100644
--- a/unittest/libmariadb/misc.c
+++ b/unittest/libmariadb/misc.c
@@ -1401,6 +1401,7 @@ static int test_sslenforce(MYSQL *unused __attribute__((unused)))
   const char *env= getenv("MYSQL_TMP_DIR");
   char cnf_file1[FN_REFLEN + 1];
 
+  SKIP_NOTLS;
   SKIP_SKYSQL;
 
   if (travis_test)
diff --git a/unittest/libmariadb/my_test.h b/unittest/libmariadb/my_test.h
index 580300fb..8bdac80f 100644
--- a/unittest/libmariadb/my_test.h
+++ b/unittest/libmariadb/my_test.h
@@ -61,7 +61,17 @@ if (IS_SKYSQL(hostname)) \
 { \
   diag("Not supported by SkySQL"); \
   return SKIP; \
-}       
+}
+
+#ifndef HAVE_SSL
+#define SKIP_NOTLS \
+{ \
+  diag("TLS not supported"); \
+  return SKIP;\
+}
+#else
+#define SKIP_NOTLS
+#endif
 
 #define MAX_KEY MAX_INDEXES
 #define MAX_KEY_LENGTH_DECIMAL_WIDTH 4          /* strlen("4096") */