diff --git a/libmariadb/ma_stmt_codec.c b/libmariadb/ma_stmt_codec.c
index ab3ec1ed..0cb2eb7d 100644
--- a/libmariadb/ma_stmt_codec.c
+++ b/libmariadb/ma_stmt_codec.c
@@ -993,7 +993,7 @@ static void convert_from_double(MYSQL_BIND *r_param, const MYSQL_FIELD *field, d
        if (field->length < length || field->length > MAX_DOUBLE_STRING_REP_LENGTH - 1)
          break;
        ma_bmove_upp(buff + field->length, buff + length, length);
-       /* coverity [bad_memset] */
+       /* coverity[bad_memset] */
        memset((void*) buff, (int) '0', field->length - length);
        length= field->length;
      }
diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index d82c5df1..26f00f87 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -914,10 +914,7 @@ static int parse_connection_string(MYSQL *mysql, const char *unused __attribute_
             pos += 2;
             continue;
           }
-          if (in_curly_brace)
-            in_curly_brace= 0;
-          else
-            goto error;
+          in_curly_brace= 0;
           *pos++= 0;
           continue;
         }
diff --git a/travis.sh b/travis.sh
index cb87ef63..0d633849 100755
--- a/travis.sh
+++ b/travis.sh
@@ -51,7 +51,7 @@ if [ -n "$server_branch" ] ; then
   make -j9
 
   cd mysql-test/
-  ./mysql-test-run.pl --suite=main ${TEST_OPTION} --parallel=auto --skip-test=session_tracker_last_gtid
+  ./mysql-test-run.pl --suite=main,unit ${TEST_OPTION} --parallel=auto --skip-test=session_tracker_last_gtid
 
 else
 
diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c
index be759459..4f449281 100644
--- a/unittest/libmariadb/connection.c
+++ b/unittest/libmariadb/connection.c
@@ -2433,8 +2433,8 @@ static int test_conc748(MYSQL *my __attribute__((unused)))
     mysql_ssl_set(mysql, NULL, NULL, NULL, NULL, NULL);
     mysql_optionsv(mysql, MYSQL_OPT_SSL_CIPHER, ciphers[i]);
 
-    if (!my_test_connect(mysql, hostname, NULL,
-                               NULL, schema, port, socketname, 0, 0))
+    if (!my_test_connect(mysql, hostname, username,
+                         password, schema, port, socketname, 0))
     {
       diag("error: %s", mysql_error(mysql));
       return FAIL;