diff -r f20df9375ac9 -r 3c4c913195e3 hotspot/test/runtime/Unsafe/FieldOffset.java
--- a/hotspot/test/runtime/Unsafe/FieldOffset.java	Thu Aug 25 14:12:09 2016 +0400
+++ b/hotspot/test/runtime/Unsafe/FieldOffset.java	Thu Aug 25 08:40:53 2016 -0400
@@ -31,14 +31,14 @@
  */
 
 import java.lang.reflect.Field;
-import jdk.test.lib.Utils;
+import jdk.test.lib.unsafe.UnsafeHelper;
 import jdk.internal.misc.Unsafe;
 import java.lang.reflect.*;
 import static jdk.test.lib.Asserts.*;
 
 public class FieldOffset {
     public static void main(String args[]) throws Exception {
-        Unsafe unsafe = Utils.getUnsafe();
+        Unsafe unsafe = UnsafeHelper.getUnsafe();
         Field[] fields = Test.class.getDeclaredFields();
 
         for (int i = 0; i < fields.length; i++) {