--- a/make/RunTestsPrebuiltSpec.gmk	Mon Nov 27 14:24:23 2017 +0100
+++ b/make/RunTestsPrebuiltSpec.gmk	Mon Nov 27 14:25:35 2017 +0100
@@ -134,16 +134,16 @@
 # FIXME: Can we remove this?
 HOTSPOT_TOPDIR:=$(TOPDIR)/hotspot
 
-SUPPORT_OUTPUTDIR := $(OUTPUT_ROOT)/support
-BUILDTOOLS_OUTPUTDIR := $(OUTPUT_ROOT)/buildtools
+SUPPORT_OUTPUTDIR := $(OUTPUTDIR)/support
+BUILDTOOLS_OUTPUTDIR := $(OUTPUTDIR)/buildtools
 
-HOTSPOT_OUTPUTDIR := $(OUTPUT_ROOT)/hotspot
-JDK_OUTPUTDIR := $(OUTPUT_ROOT)/jdk
-IMAGES_OUTPUTDIR := $(OUTPUT_ROOT)/images
-BUNDLES_OUTPUTDIR := $(OUTPUT_ROOT)/bundles
-TESTMAKE_OUTPUTDIR := $(OUTPUT_ROOT)/test-make
-MAKESUPPORT_OUTPUTDIR := $(OUTPUT_ROOT)/make-support
-BUILDJDK_OUTPUTDIR := $(OUTPUT_ROOT)/buildjdk
+HOTSPOT_OUTPUTDIR := $(OUTPUTDIR)/hotspot
+JDK_OUTPUTDIR := $(OUTPUTDIR)/jdk
+IMAGES_OUTPUTDIR := $(OUTPUTDIR)/images
+BUNDLES_OUTPUTDIR := $(OUTPUTDIR)/bundles
+TESTMAKE_OUTPUTDIR := $(OUTPUTDIR)/test-make
+MAKESUPPORT_OUTPUTDIR := $(OUTPUTDIR)/make-support
+BUILDJDK_OUTPUTDIR := $(OUTPUTDIR)/buildjdk
 
 ### FIXME?
 #JAVA_FLAGS:= -Duser.language=en -Duser.country=US