Straight test fix backport: Bug: https://bugs.openjdk.java.net/browse/JDK-7084032 Review: http://mail.openjdk.java.net/pipermail/net-dev/2011-September/003467.html Changeset: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/5b8f8397379f -Rob