moar cleanup

Avoid broken tests because they're run in parallel for multiple Python versions.