diff --git a/unittest/libmariadb/errors.c b/unittest/libmariadb/errors.c
index 2f895c9d..bd4f05fb 100644
--- a/unittest/libmariadb/errors.c
+++ b/unittest/libmariadb/errors.c
@@ -287,6 +287,7 @@ static int test_mdev35935(MYSQL *mysql)
   MYSQL_BIND bind[2];
   const char *data= "test";
 
+  SKIP_MAXSCALE;
   SKIP_MYSQL(mysql);
 
   rc= mysql_select_db(mysql, schema);
diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c
index f57b42a0..7072946b 100644
--- a/unittest/libmariadb/ps_bugs.c
+++ b/unittest/libmariadb/ps_bugs.c
@@ -5001,7 +5001,7 @@ static int test_conc_fraction(MYSQL *mysql)
 
   for (i=0; i < 10; i++, frac=frac*10+i)
   {
-    my_ulonglong expected= 0;
+    unsigned int expected= frac;
     sprintf(query, "SELECT '2018-11-05 22:25:59.%ld'", frac);
 
     diag("%d: %s", i, query);
@@ -5027,7 +5027,8 @@ static int test_conc_fraction(MYSQL *mysql)
 
     diag("second_part: %ld", tm.second_part);
 
-    expected= frac * 100000;
+    while (expected && expected < 100000)
+      expected *= 10;
     while (expected >= 1000000)
       expected /= 10;