diff --git a/.travis.yml b/.travis.yml
index 6a930156..ffbcd120 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,8 @@ jobs:
     - env: srv=skysql
     - env: srv=skysql-ha
     - env: srv=xpand
-    - env: srv=mysql
+    - env: srv=mysql v=5.7
+    - env: srv=mysql v=8.0
   include:
     - stage: Minimal
       env: srv=mariadb v=10.6 packet=8
@@ -68,8 +69,6 @@ jobs:
       name: "ES 23.08"
     - env: srv=maxscale
       name: "Maxscale"
-    - env: srv=xpand TEST_DB_OTHER="&initSql=SET NAMES UTF8"
-      name: "Xpand"
     - env: srv=skysql
       name: "SkySQL"
     - env: srv=skysql-ha
@@ -97,7 +96,7 @@ jobs:
       name: "CS 10.11 with ps-protocol"
     - env: srv=mariadb v=11.0 local=1
       name: "CS 11.0"
-    - env: srv=mariadb v=11.1-rc local=1
+    - env: srv=mariadb v=11.1 local=1
       name: "CS 11.1"
     - env: srv=mysql v=5.7 native=1
       name: "MySQL 5.7"
diff --git a/travis.sh b/travis.sh
index 0f45162a..c316dec2 100755
--- a/travis.sh
+++ b/travis.sh
@@ -93,8 +93,8 @@ else
     fi
     export MYSQL_TEST_TLS=$TEST_REQUIRE_TLS
     export SSLCERT=$TEST_DB_SERVER_CERT
-    if [ -n "$MYSQL_TEST_SSL_PORT" ] ; then
-      export MYSQL_TEST_SSL_PORT=$MYSQL_TEST_SSL_PORT
+    if [ -n "$TEST_MAXSCALE_TLS_PORT" ] ; then
+      export MYSQL_TEST_SSL_PORT=$TEST_MAXSCALE_TLS_PORT
     fi
     make
   fi
diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c
index 4d5f3d38..517bc538 100644
--- a/unittest/libmariadb/connection.c
+++ b/unittest/libmariadb/connection.c
@@ -2041,13 +2041,7 @@ static int test_conn_str_1(MYSQL *my __attribute__((unused)))
 
   sprintf(conn_str, "connection=host=%s;user=%s;password=%s;port=%d;ssl_enforce=1;socket=%s",
                 hostname ? hostname : "localhost", username ? username : "", 
-                password ? password : "", port, socketname ? socketname : "");
-
-  /* SkySQL requires secure connection */
-  if (IS_SKYSQL(hostname))
-  {
-    strcat(conn_str, ";ssl_enforce=1");
-  }
+                password ? password : "", ssl_port, socketname ? socketname : "");
 
   fprintf(fp, "[client]\n");
   fprintf(fp, "%s\n", conn_str);
@@ -2132,16 +2126,22 @@ static int test_conc365_reconnect(MYSQL *my)
   MYSQL *mysql= mysql_init(NULL);
   char tmp[1024];
   my_bool reconnect= 1;
+  SKIP_MAXSCALE;
 
   mysql_options(mysql, MYSQL_OPT_RECONNECT, &reconnect);
 
-  snprintf(tmp, sizeof(tmp) - 1,
-   "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s",
-   hostname ? hostname : "localhost", username ? username : "", password ? password : "",
-   port, socketname ? socketname : "");
-
- if (IS_SKYSQL(hostname))
-   strcat(tmp, ";ssl_enforce=1");
+  if (IS_SKYSQL(hostname))
+  {
+    snprintf(tmp, sizeof(tmp) - 1,
+      "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s;ssl_enforce=1",
+      hostname ? hostname : "localhost", username ? username : "", password ? password : "",
+      ssl_port, socketname ? socketname : "");
+  } else {
+    snprintf(tmp, sizeof(tmp) - 1,
+      "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s",
+      hostname ? hostname : "localhost", username ? username : "", password ? password : "",
+      port, socketname ? socketname : "");
+  }
 
   if (!my_test_connect(mysql, tmp, username,
                              password, schema, port, socketname, CLIENT_REMEMBER_OPTIONS))
diff --git a/unittest/libmariadb/my_test.h b/unittest/libmariadb/my_test.h
index a3384747..9f75d67a 100644
--- a/unittest/libmariadb/my_test.h
+++ b/unittest/libmariadb/my_test.h
@@ -57,7 +57,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 # define TRUE 1
 #endif
 
-#define IS_SKYSQL(a) ((a) && strstr((a), "db.skysql.net"))
+#define IS_SKYSQL(a) ((a) && strstr((a), "skysql.mariadb.com"))
 #define SKIP_SKYSQL \
 if (IS_SKYSQL(hostname)) \
 { \