Don't ignore the environment variable.
Update Solaris test suite cleanup.