diff -r de3789bb384e -r c388d897472d hotspot/test/runtime/Unsafe/NestedUnsafe.java
--- a/hotspot/test/runtime/Unsafe/NestedUnsafe.java	Tue Sep 13 21:29:30 2016 +0000
+++ b/hotspot/test/runtime/Unsafe/NestedUnsafe.java	Wed Sep 14 08:17:50 2016 -0400
@@ -35,7 +35,6 @@
 import java.io.InputStream;
 import java.lang.*;
 import jdk.test.lib.InMemoryJavaCompiler;
-import jdk.test.lib.unsafe.UnsafeHelper;
 import jdk.internal.misc.Unsafe;
 import static jdk.test.lib.Asserts.*;
 
@@ -50,7 +49,7 @@
         " } } ");
 
     public static void main(String args[]) throws Exception {
-        Unsafe unsafe = UnsafeHelper.getUnsafe();
+        Unsafe unsafe = Unsafe.getUnsafe();
 
         Class klass = unsafe.defineAnonymousClass(NestedUnsafe.class, klassbuf, new Object[0]);
         unsafe.ensureClassInitialized(klass);