diff --git a/.travis.yml b/.travis.yml
index ae991899b..3e10275cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 os: linux
-dist: bionic
+dist: jammy
 language: java
 services:
   - docker
@@ -47,19 +47,30 @@ jobs:
   allow_failures:
     - env: srv=build
     - env: srv=xpand TEST_DB_OTHER="&initSql=SET NAMES UTF8"
+    - env: srv=mariadb-es local=1
+    - env: srv=skysql
+    - env: srv=skysql-ha
   include:
     - stage: Minimal
       env: srv=mariadb v=10.6 packet=8
       name: "CS 10.6"
-    - env: srv=mariadb-es v=10.6
-      name: "ES 10.6"
+    - env: srv=mariadb-es
+      name: "ES latest"
       if: type = push AND fork = false
 
     - stage: Enterprise
       env: srv=mariadb-es v=10.4
+      dist: bionic
       name: "ES 10.4"
     - env: srv=mariadb-es v=10.5
+      dist: bionic
       name: "ES 10.5"
+    - env: srv=mariadb-es v=10.6
+      name: "ES 10.6"
+      if: type = push AND fork = false
+    - env: srv=mariadb-es-test v=23.06
+      name: "ES 23.06"
+      if: type = push AND fork = false
     - env: srv=maxscale
       name: "Maxscale"
     - env: srv=xpand TEST_DB_OTHER="&initSql=SET NAMES UTF8"
@@ -74,18 +85,22 @@ jobs:
       os: windows
       language: shell
       name: "CS 10.6 - Windows"
-    - env: srv=mariadb v=10.3 local=1
-      name: "CS 10.3"
     - env: srv=mariadb v=10.4 local=1
+      dist: bionic
       name: "CS 10.4"
     - env: srv=mariadb v=10.5 local=1
+      dist: bionic
       name: "CS 10.5"
-    - env: srv=mariadb v=10.7 local=1
-      name: "CS 10.7"
-    - env: srv=mariadb v=10.8 local=1
-      name: "CS 10.8"
     - env: srv=mariadb v=10.9 local=1
       name: "CS 10.9"
+    - env: srv=mariadb v=10.10 local=1
+      name: "CS 10.10"
+    - env: srv=mariadb v=10.11 local=1
+      name: "CS 10.11"
+    - env: srv=mariadb v=11.0 local=1
+      name: "CS 11.0"
+    - env: srv=mariadb v=11.1-rc local=1
+      name: "CS 11.1"
     - env: srv=mariadb v=10.6 packet=40
       jdk: openjdk17
       name: "CS 10.6 - openjdk 17"
@@ -110,3 +125,6 @@ script:
 
 after_script:
   - bash <(curl -s https://codecov.io/bash)
+
+after_failure:
+  - if [ "$srv" == "maxscale" ] ; then docker-compose -f ${COMPOSE_FILE} exec -u root maxscale tail -500 /var/log/maxscale/maxscale.log; fi
\ No newline at end of file