Merge pull request #11744 from ja-pa/pytest-new