pytest

3d470555 - Merge pull request #7190 from hroncok/backport-7179