Porting to pytest 2.5.1