fix jdk-test failures