Merge pull request #9941 from valeriosetti/issue94-3.6

[Backport 3.6] Move test_psa_*.py scripts to the framework