bpo-37531: sync regrtest with master branch (GH-16285)

2 files changed