[1.0] Another python 2.6 related fix to tests