--- old/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java	2016-09-12 13:57:43.965044603 -0400
+++ new/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java	2016-09-12 13:57:43.432324455 -0400
@@ -39,7 +39,7 @@
  * Concrete subclasses should implement method {@link #process()}.
  */
 public abstract class PathHandler {
-    private static final Unsafe UNSAFE = jdk.test.lib.unsafe.UnsafeHelper.getUnsafe();
+    private static final Unsafe UNSAFE = Unsafe.getUnsafe();
     private static final AtomicLong CLASS_COUNT = new AtomicLong(0L);
     private static volatile boolean CLASSES_LIMIT_REACHED = false;
     private static final Pattern JAR_IN_DIR_PATTERN