Backport PR #23513 on branch 6.x (PR: Improve reliability of some tests and fix teardown error for another one)

Backport PR #23513 on branch 6.x (PR: Improve reliability of some tests and fix teardown error for another one) #51388