diff -r a8754858a7fc -r b8d532cb6420 hotspot/test/testlibrary_tests/ctw/CtwTest.java
--- a/hotspot/test/testlibrary_tests/ctw/CtwTest.java	Sat May 02 18:40:37 2015 -0700
+++ b/hotspot/test/testlibrary_tests/ctw/CtwTest.java	Mon May 04 16:30:07 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -36,8 +36,8 @@
 import java.nio.file.StandardCopyOption;
 import java.nio.charset.Charset;
 
-import com.oracle.java.testlibrary.JDKToolFinder;
-import com.oracle.java.testlibrary.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.OutputAnalyzer;
 
 public abstract class CtwTest {
     protected final String[] shouldContain;