Fix openjdk tests