Upgrade py.test to 2.5.1