pytest

[7.0.x] Merge pull request #9522 from holmanb/rewrite-test

#9530

Merged