diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 8019a2150d..88fc35d639 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -229,7 +229,7 @@ jobs:
           - "8.3"
         postgres-version:
           - "9.4"
-          - "16"
+          - "11" # We have code specific to 10.0-12.0
           - "17"
         extension:
           - "pgsql"
@@ -306,13 +306,9 @@ jobs:
         mariadb-version:
           # keep in sync with https://mariadb.org/about/#maintenance-policy
           - "10.0"  # Oldest version supported by DBAL
-          - "10.4"  # LTS (Jun 2024)
-          - "10.5"  # LTS (Jun 2025)
-          - "10.6"  # LTS (Jul 2026)
-          - "10.11" # LTS (Feb 2028)
-          - "11.1"  # STS (Aug 2024)
-          - "11.2"  # STS (Nov 2024)
-          - "11.3"  # STS (Feb 2025)
+          - "10.5"  # We have code specific to 10.4.3-10.6.0
+          - "10.6"  # We have code specific to 10.6.0-10.10.0
+          - "10.11" # We have code specific to ^10.10
           - "11.4"  # LTS (May 2029)
         extension:
           - "mysqli"
@@ -389,7 +385,7 @@ jobs:
           - "8.3"
         mysql-version:
           - "5.7"
-          - "8.0"
+          - "8.0" # We have code specific to ^8.0
           - "9.1"
         extension:
           - "mysqli"
@@ -419,17 +415,6 @@ jobs:
           - php-version: "8.4"
             mysql-version: "9.1"
             extension: "pdo_mysql"
-          # Workaround for https://bugs.mysql.com/114876
-          - php-version: "8.3"
-            mysql-version: "8.4"
-            extension: "mysqli"
-            custom-entrypoint: >-
-              --entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
-          - php-version: "8.3"
-            mysql-version: "8.4"
-            extension: "pdo_mysql"
-            custom-entrypoint: >-
-              --entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
 
     services:
       mysql: