@bcmills requested issue #52998 to be considered for backport to the next 1.18 minor release.
@gopherbot, please backport to Go 1.18 and 1.17. This is a test-only fix for a test that occasionally deadlocks, which can cause TryBot stalls and spurious failures on release branches.