Issue #12125: fixed the failures under Solaris due to improper test cleanup.
4 files changed