SHDP-433 Fix tests for jdk6