pytest

b66899d3 - Merge pull request #9530 from nicoddemus/backport-9522