Issue #24402: Merge potential test fix from 3.4 into 3.5