3806. [test] Improved system test portability. [RT #35625] (cherry picked from commit 922959581bbdd70d5c9cae1cb107974c3d38ed08) (cherry picked from commit 37010ff8247757b57241dea1cc67c82a6aa71948)
3806. [test] Improved system test portability. [RT #35625] (cherry picked from commit 922959581bbdd70d5c9cae1cb107974c3d38ed08) (cherry picked from commit 37010ff8247757b57241dea1cc67c82a6aa71948)