--- a/hotspot/test/compiler/arguments/BMIUnsupportedCPUTest.java	Sat May 02 18:40:37 2015 -0700
+++ b/hotspot/test/compiler/arguments/BMIUnsupportedCPUTest.java	Mon May 04 16:30:07 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-import com.oracle.java.testlibrary.*;
-import com.oracle.java.testlibrary.cli.*;
+import jdk.test.lib.*;
+import jdk.test.lib.cli.*;
 
 /**
  * Test on bit manipulation related command line options,