--- old/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java 2016-09-12 13:56:33.475318436 -0400 +++ new/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java 2016-09-12 13:56:32.875404262 -0400 @@ -48,7 +48,6 @@ import jdk.internal.misc.Unsafe; import jdk.test.lib.Asserts; import jdk.test.lib.process.OutputAnalyzer; -import jdk.test.lib.unsafe.UnsafeHelper; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; @@ -133,7 +132,7 @@ } public static class Test implements CompilableTest { - private static final Unsafe UNSAFE = UnsafeHelper.getUnsafe(); + private static final Unsafe UNSAFE = Unsafe.getUnsafe(); private final Object monitor = new Object(); @Override