diff -r de3789bb384e -r c388d897472d hotspot/test/runtime/Unsafe/PageSize.java
--- a/hotspot/test/runtime/Unsafe/PageSize.java	Tue Sep 13 21:29:30 2016 +0000
+++ b/hotspot/test/runtime/Unsafe/PageSize.java	Wed Sep 14 08:17:50 2016 -0400
@@ -31,13 +31,12 @@
  */
 
 import java.lang.reflect.Field;
-import jdk.test.lib.unsafe.UnsafeHelper;
 import jdk.internal.misc.Unsafe;
 import static jdk.test.lib.Asserts.*;
 
 public class PageSize {
     public static void main(String args[]) throws Exception {
-        Unsafe unsafe = UnsafeHelper.getUnsafe();
+        Unsafe unsafe = Unsafe.getUnsafe();
         int pageSize = unsafe.pageSize();
 
         for (int n = 1; n != 0; n <<= 1) {