diff --git a/.github/files/test-plugin-update/setup.sh b/.github/files/test-plugin-update/setup.sh
index a88ec6fb3d643..9953912ad8afa 100755
--- a/.github/files/test-plugin-update/setup.sh
+++ b/.github/files/test-plugin-update/setup.sh
@@ -2,7 +2,7 @@
 
 set -eo pipefail
 
-echo "::group::Setup database"
+echo "::group::Set up database"
 cat <<EOF > ~/.my.cnf
 [client]
 host=${MYSQL_HOST%:*}
@@ -16,7 +16,7 @@ mysql -e "drop database if exists wordpress;"
 mysql -e "create database wordpress;"
 echo "::endgroup::"
 
-echo "::group::Setup WordPress"
+echo "::group::Set up WordPress"
 mkdir -p /var/log/php/ /var/scripts/
 cd /var/www/html
 sed -i 's/apachectl -D FOREGROUND/apachectl start/' /usr/local/bin/run
diff --git a/tools/docker/bin/run.sh b/tools/docker/bin/run.sh
index 43a95261bef05..4deda93642679 100755
--- a/tools/docker/bin/run.sh
+++ b/tools/docker/bin/run.sh
@@ -13,7 +13,11 @@ user="${APACHE_RUN_USER:-www-data}"
 group="${APACHE_RUN_GROUP:-www-data}"
 
 # Download WordPress
-[ -f /var/www/html/xmlrpc.php ] || wp core download
+# Sometimes it fails, and a retry would be nice:
+#   https://github.com/wp-cli/core-command/pull/258
+#   https://github.com/wp-cli/wp-cli/pull/6140
+# For now this should work well enough
+[ -f /var/www/html/xmlrpc.php ] || wp core download || sleep $(( 30 + RANDOM % 8 )) && wp core download
 
 # Configure WordPress
 if [ ! -f /var/www/html/wp-config.php ]; then