diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 95eb832..16e8911 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -141,6 +141,12 @@ jobs:
           mysql database: 'typo3'
           mysql root password: 'root'
 
+      - name: Wait for MySQL
+        run: |
+          while ! mysqladmin ping --host=127.0.0.1 --password=root --silent; do
+          sleep 1
+          done
+
       - name: Install dependencies with expected TYPO3 version
         run: composer require --prefer-dist --no-progress "typo3/cms-backend:${{ matrix.typo3-version }}" "typo3/cms-core:${{ matrix.typo3-version }}" "typo3/cms-dashboard:${{ matrix.typo3-version }}"
 
diff --git a/Documentation/Changelog/2.6.0.rst b/Documentation/Changelog/2.6.0.rst
index b28039b..64e20a2 100644
--- a/Documentation/Changelog/2.6.0.rst
+++ b/Documentation/Changelog/2.6.0.rst
@@ -22,6 +22,9 @@ Tasks
 * Ignore PHP version when executing cs fixer.
   As cs fixer officially does not seem to support PHP 8.2 yet.
 
+* Make sql within tests on CI more robust.
+  Wait until server has started before executing tests.
+
 Deprecation
 -----------