diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d44184a..4318045 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -58,9 +58,6 @@ jobs:
         image: clickhouse/clickhouse-server:26.3.3.20
         ports:
           - 8124:8123
-        env:
-          CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
-          CLICKHOUSE_PASSWORD: ""
         options: >-
           --health-cmd "curl -f http://localhost:8123/ping"
           --health-interval 10s
@@ -82,8 +79,19 @@ jobs:
 
       - name: Copy ClickHouse config for deprecated syntax
         run: |
-          docker cp tests/clickhouse-latest-config/allow_deprecated.xml $(docker ps -q --filter "ancestor=clickhouse/clickhouse-server:26.3.3.20"):/etc/clickhouse-server/users.d/allow_deprecated.xml
-          sleep 2
+          CONTAINER_ID=$(docker ps -q --filter "ancestor=clickhouse/clickhouse-server:26.3.3.20")
+          docker cp tests/clickhouse-latest-config/allow_deprecated.xml "$CONTAINER_ID":/etc/clickhouse-server/users.d/allow_deprecated.xml
+          docker restart "$CONTAINER_ID"
+          for i in {1..30}; do
+            if curl -fs http://127.0.0.1:8124/ping > /dev/null; then
+              echo "ClickHouse ready"
+              exit 0
+            fi
+            sleep 2
+          done
+          echo "ClickHouse failed to become ready"
+          docker logs "$CONTAINER_ID"
+          exit 1
 
       - name: Run tests (ClickHouse 26.3)
         run: ./vendor/bin/phpunit -c phpunit-ch26.xml