--- old/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java	2017-05-26 10:30:28.000000000 -0700
+++ new/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java	2017-05-26 10:30:28.000000000 -0700
@@ -27,7 +27,7 @@
  * @key randomness
  * @summary Test verifies that lambda forms are cached when run with multiple threads
  * @author kshefov
- * @library /java/lang/invoke/common /lib/testlibrary
+ * @library /lib/testlibrary /java/lang/invoke/common
  * @modules java.base/java.lang.invoke:open
  *          java.base/java.lang.ref:open
  *          java.management
@@ -38,6 +38,8 @@
  * @run main/othervm LFMultiThreadCachingTest
  */
 
+import test.java.lang.invoke.lib.CodeCacheOverflowProcessor;
+
 import java.lang.invoke.MethodHandle;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -46,7 +48,6 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CyclicBarrier;
-import test.java.lang.invoke.lib.CodeCacheOverflowProcessor;
 
 /**
  * Multiple threaded lambda forms caching test class.