diff --git a/unittest/libmariadb/CMakeLists.txt b/unittest/libmariadb/CMakeLists.txt
index c592c781..1fc8affa 100644
--- a/unittest/libmariadb/CMakeLists.txt
+++ b/unittest/libmariadb/CMakeLists.txt
@@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include
 ADD_DEFINITIONS(-DLIBMARIADB)
 
 
-SET(API_TESTS "conc336" "bulk1" "performance" "basic-t" "fetch" "charset" "logs" "cursor" "errors" "view" "ps" "ps_bugs" "sp" "result" "connection" "misc" "ps_new" "thread" "features-10_2")
+SET(API_TESTS "bulk1" "performance" "basic-t" "fetch" "charset" "logs" "cursor" "errors" "view" "ps" "ps_bugs" "sp" "result" "connection" "misc" "ps_new" "thread" "features-10_2")
 IF(WITH_DYNCOL)
   SET(API_TESTS ${API_TESTS} "dyncol")
 ENDIF()
@@ -45,7 +45,7 @@ IF(NOT WIN32)
 ENDIF()
 
 #exclude following tests from ctests, since we need to run them manually with different credentials
-SET(MANUAL_TESTS "t_conc173" "rpl_api")
+SET(MANUAL_TESTS "t_conc173" "rpl_api" "conc336") 
 # Get finger print from server certificate
 IF(WITH_SSL)
   IF(CERT_PATH AND NOT DEFINED ENV{TRAVIS})
diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c
index 154119d9..dfced930 100644
--- a/unittest/libmariadb/connection.c
+++ b/unittest/libmariadb/connection.c
@@ -2456,8 +2456,10 @@ static int test_conc589(MYSQL *my)
   MYSQL_RES *result;
   int rc;
   my_bool reconnect= 1;
+  my_bool no= 0;
   unsigned long last_thread_id= 0;
 
+  mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &no);
   mysql_options(mysql, MYSQL_OPT_RECONNECT, &reconnect);
 
   if (!my_test_connect(mysql, hostname, username,