3.6.x test fixes for Solaris