More yak shaving for py.test