diff -r f20df9375ac9 -r 3c4c913195e3 hotspot/test/runtime/Unsafe/SetMemory.java
--- a/hotspot/test/runtime/Unsafe/SetMemory.java	Thu Aug 25 14:12:09 2016 +0400
+++ b/hotspot/test/runtime/Unsafe/SetMemory.java	Thu Aug 25 08:40:53 2016 -0400
@@ -30,13 +30,13 @@
  * @run main SetMemory
  */
 
-import jdk.test.lib.Utils;
+import jdk.test.lib.unsafe.UnsafeHelper;
 import jdk.internal.misc.Unsafe;
 import static jdk.test.lib.Asserts.*;
 
 public class SetMemory {
     public static void main(String args[]) throws Exception {
-        Unsafe unsafe = Utils.getUnsafe();
+        Unsafe unsafe = UnsafeHelper.getUnsafe();
         long address = unsafe.allocateMemory(1);
         assertNotEquals(address, 0L);
         unsafe.setMemory(address, 1, (byte)17);