Update to pytest 2.5.1
Fix failures on Python 3.x