Make all the py2 tests happy