Updating to run against py.test 2.5.2