diff -r f79b4f079360 -r 8b2580e63aa0 hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java
--- a/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java	Tue Sep 20 17:30:33 2016 +0300
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java	Tue Sep 20 16:34:45 2016 -0400
@@ -50,7 +50,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;
 
@@ -126,7 +125,7 @@
     public static class Test implements CompilableTest {
         private static final int TOTAL_ITERATIONS = 10000;
         private static final int WARMUP_ITERATIONS = 1000;
-        private static final Unsafe UNSAFE = UnsafeHelper.getUnsafe();
+        private static final Unsafe UNSAFE = Unsafe.getUnsafe();
         private final Object monitor = new Object();
         // Following field have to be static in order to avoid escape analysis.
         @SuppressWarnings("UnsuedDeclaration")