diff --git a/.travis.yml b/.travis.yml
index b71f0b17..bf5c2124 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,6 @@ jobs:
       env: srv=mariadb-es v=10.5
     - if: type = push AND fork = false
       env: srv=maxscale
-    - if: type = push AND fork = false
     - env: srv=mysql v=5.7 native=1
     - env: srv=mysql v=8.0 native=1
     - if: type = push AND fork = false
@@ -59,9 +58,5 @@ jobs:
       env: srv=skysql-ha
     - env: server_branch=10.5
     - env: server_branch=10.5 TEST_OPTION=--ps-protocol
-    - env: server_branch=10.6
-    - env: server_branch=10.6 TEST_OPTION=--ps-protocol
-    - env: server_branch=10.11
-    - env: server_branch=10.11 TEST_OPTION=--ps-protocol
 
 script: ./travis.sh
diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c
index 6b00dd61..7c3a8256 100644
--- a/unittest/libmariadb/connection.c
+++ b/unittest/libmariadb/connection.c
@@ -618,6 +618,12 @@ int test_conc21(MYSQL *mysql)
   int major=0, minor= 0, patch=0;
   SKIP_MAXSCALE;
 
+  if (strlen(mysql_get_server_info(mysql)) > 63)
+  {
+    diag("server name is too long - skip until rpl hack was removed");
+    return SKIP;
+  }
+
   rc= mysql_query(mysql, "SELECT @@version");
   check_mysql_rc(rc, mysql);