--- old/test/TEST.ROOT	2015-10-22 21:51:13.507161224 -0700
+++ new/test/TEST.ROOT	2015-10-22 21:51:13.350160361 -0700
@@ -28,3 +28,7 @@
 
 # Tests using jtreg 4.1 b11 features
 requiredVersion=4.1 b11
+
+# Path to libraries in the topmost test directory. This is needed so @library
+# does not need ../../ notation to reach them
+external.lib.roots = ../../
--- old/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java	2015-10-22 21:51:13.776162697 -0700
+++ new/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java	2015-10-22 21:51:13.679162166 -0700
@@ -38,7 +38,7 @@
  * @bug 6455258
  * @summary Sanity test for com.sun.management.HotSpotDiagnosticMXBean.dumpHeap method
  * @library /lib/testlibrary
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.hprof.*
  * @build jdk.test.lib.hprof.module.*
--- old/test/java/util/Arrays/TimSortStackSize2.java	2015-10-22 21:51:14.081164378 -0700
+++ new/test/java/util/Arrays/TimSortStackSize2.java	2015-10-22 21:51:13.948163641 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8072909
- * @library /lib/testlibrary /../../test/lib
+ * @library /lib/testlibrary /test/lib
  * @build jdk.testlibrary.*
  * @build TimSortStackSize2
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- old/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java	2015-10-22 21:51:14.356165877 -0700
+++ new/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java	2015-10-22 21:51:14.255165324 -0700
@@ -42,7 +42,7 @@
  * @summary setInterval() for local MonitoredHost and local MonitoredVm
  * @modules jdk.jvmstat/sun.jvmstat.monitor
  * @library /lib/testlibrary
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.apps.*
  * @run main TestPollingInterval
--- old/test/sun/tools/jhsdb/BasicLauncherTest.java	2015-10-22 21:51:14.661167550 -0700
+++ new/test/sun/tools/jhsdb/BasicLauncherTest.java	2015-10-22 21:51:14.534166853 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Basic test for jhsdb launcher
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @library /lib/testlibrary
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.apps.*
--- old/test/sun/tools/jmap/BasicJMapTest.java	2015-10-22 21:51:14.932169036 -0700
+++ new/test/sun/tools/jmap/BasicJMapTest.java	2015-10-22 21:51:14.844168553 -0700
@@ -38,7 +38,7 @@
  * @summary Unit test for jmap utility
  * @key intermittent
  * @library /lib/testlibrary
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @modules java.management
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.hprof.*
--- old/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java	2015-10-22 21:51:15.206170538 -0700
+++ new/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java	2015-10-22 21:51:15.118170055 -0700
@@ -36,7 +36,7 @@
  * @test
  * @bug 8042397
  * @summary Unit test for jmap utility test heap configuration reader
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @library /lib/testlibrary
  * @modules java.management
  * @build jdk.testlibrary.*
--- old/test/sun/tools/jstack/DeadlockDetectionTest.java	2015-10-22 21:51:15.575172586 -0700
+++ new/test/sun/tools/jstack/DeadlockDetectionTest.java	2015-10-22 21:51:15.377171475 -0700
@@ -37,7 +37,7 @@
 /*
  * @test
  * @summary Test deadlock detection
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @library /lib/testlibrary
  * @modules java.management
  * @build jdk.testlibrary.*