--- a/hotspot/test/testlibrary/jittester/Makefile	Tue Aug 23 18:57:21 2016 +0200
+++ b/hotspot/test/testlibrary/jittester/Makefile	Tue Aug 23 18:03:37 2016 +0000
@@ -70,17 +70,17 @@
 DIST_JAR = $(DIST_DIR)/JITtester.jar
 
 SRC_FILES = $(shell find $(SRC_DIR) -name '*.java')
-TESTLIBRARY_SRC_DIR = ../jdk/test/lib
+TESTLIBRARY_SRC_DIR = ../../../../test/lib/jdk/test/lib
 TESTLIBRARY_SRC_FILES = $(TESTLIBRARY_SRC_DIR)/Asserts.java \
                         $(TESTLIBRARY_SRC_DIR)/JDKToolFinder.java \
                         $(TESTLIBRARY_SRC_DIR)/JDKToolLauncher.java \
-                        $(TESTLIBRARY_SRC_DIR)/OutputAnalyzer.java \
-                        $(TESTLIBRARY_SRC_DIR)/OutputBuffer.java \
-                        $(TESTLIBRARY_SRC_DIR)/Pair.java \
                         $(TESTLIBRARY_SRC_DIR)/Platform.java \
-                        $(TESTLIBRARY_SRC_DIR)/ProcessTools.java \
-                        $(TESTLIBRARY_SRC_DIR)/StreamPumper.java \
-                        $(TESTLIBRARY_SRC_DIR)/Utils.java
+                        $(TESTLIBRARY_SRC_DIR)/Utils.java \
+                        $(TESTLIBRARY_SRC_DIR)/process/OutputAnalyzer.java \
+                        $(TESTLIBRARY_SRC_DIR)/process/OutputBuffer.java \
+                        $(TESTLIBRARY_SRC_DIR)/process/ProcessTools.java \
+                        $(TESTLIBRARY_SRC_DIR)/process/StreamPumper.java \
+                        $(TESTLIBRARY_SRC_DIR)/util/Pair.java
 
 .PHONY: cleantmp
 
@@ -120,7 +120,6 @@
 
 copytestlibrary: $(DRIVER_DIR)
 	@cp -r src/jdk/test/lib/jittester/jtreg/*.java $(DRIVER_DIR)
-	@cp -r ../jdk $(TESTBASE_DIR)/
 
 testgroup: $(TESTBASE_DIR)
 	@echo 'jittester_all = \\' > $(TESTGROUP_FILE)