Fix changes for Enable CentOS Stream 9 build

[cbouchar]

Attempted to use upstream repo changes (pull #152) in Downstream repo and it fails as py.test-2 doesn't exist. In reviewing the code, python2 test support seems broken. If you know otherwise, we can just close this ticket and I'll keep my changes downstream only.