diff -r de3789bb384e -r c388d897472d hotspot/test/runtime/Unsafe/GetUncompressedObject.java
--- a/hotspot/test/runtime/Unsafe/GetUncompressedObject.java	Tue Sep 13 21:29:30 2016 +0000
+++ b/hotspot/test/runtime/Unsafe/GetUncompressedObject.java	Wed Sep 14 08:17:50 2016 -0400
@@ -30,13 +30,12 @@
 
 import static jdk.test.lib.Asserts.*;
 
-import jdk.test.lib.unsafe.UnsafeHelper;
 import jdk.internal.misc.Unsafe;
 
 public class GetUncompressedObject {
 
     public static void main(String args[]) throws Exception {
-        Unsafe unsafe = UnsafeHelper.getUnsafe();
+        Unsafe unsafe = Unsafe.getUnsafe();
 
         // Allocate some memory and fill it with non-zero values.
         final int size = 32;