Revert "TRIVIAL fixing tests after the recent infrastructure changes in pypi.python.org"

This reverts commit 9623daf0b1ace0dc526490ea12a790d57328ece5.