diff -r a8754858a7fc -r b8d532cb6420 hotspot/test/runtime/Unsafe/SetMemory.java
--- a/hotspot/test/runtime/Unsafe/SetMemory.java	Sat May 02 18:40:37 2015 -0700
+++ b/hotspot/test/runtime/Unsafe/SetMemory.java	Mon May 04 16:30:07 2015 +0200
@@ -30,9 +30,9 @@
  * @run main SetMemory
  */
 
-import com.oracle.java.testlibrary.*;
+import jdk.test.lib.*;
 import sun.misc.Unsafe;
-import static com.oracle.java.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 public class SetMemory {
     public static void main(String args[]) throws Exception {