--- a/make/RunTestsPrebuilt.gmk	Mon Nov 27 14:25:35 2017 +0100
+++ b/make/RunTestsPrebuilt.gmk	Mon Nov 27 14:31:44 2017 +0100
@@ -65,12 +65,12 @@
 # $1: the output file name
 # $2..n: The lines to output to the file.
 define CreateNewSpec
-  $(if $(strip $(13)), \
+  $(if $(strip $(16)), \
     $(error Internal makefile error: \
       Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \
   ) \
   $(shell rm -f $1) \
-  $(foreach i, 2 3 4 5 6 7 8 9 10 11 12, \
+  $(foreach i, 2 3 4 5 6 7 8 9 10 11 12 13 14 15, \
     $(if $(strip $($i)), \
       $(call AppendFile, $(strip $($i)), $1) \
     ) \
@@ -92,6 +92,10 @@
 $(eval $(call VerifyVariable,JDK_IMAGE_DIR,$(OUTPUTDIR)/images/jdk))
 $(eval $(call VerifyVariable,TEST_IMAGE_DIR,$(OUTPUTDIR)/images/test))
 
+# Provide default values for tools that we need
+$(eval $(call VerifyVariable,MAKE,make))
+$(eval $(call VerifyVariable,BASH,bash))
+
 # Now that we have verified that we have the required variables available, we
 # can include the prebuilt spec file ourselves, without an ephemeral spec
 # wrapper. This is required so we can include MakeBase which is needed for
@@ -114,9 +118,11 @@
     TOPDIR := $(TOPDIR), \
     OUTPUTDIR := $(OUTPUTDIR), \
     BOOT_JDK := $(BOOT_JDK), \
+    JT_HOME := $(JT_HOME), \
     JDK_IMAGE_DIR := $(JDK_IMAGE_DIR), \
     TEST_IMAGE_DIR := $(TEST_IMAGE_DIR), \
-    JT_HOME := $(JT_HOME), \
+    MAKE := $(MAKE), \
+    BASH := $(BASH), \
     include $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk, \
     $(CUSTOM_NEW_SPEC_LINE), \
 )

--- a/make/RunTestsPrebuiltSpec.gmk	Mon Nov 27 14:25:35 2017 +0100
+++ b/make/RunTestsPrebuiltSpec.gmk	Mon Nov 27 14:31:44 2017 +0100
@@ -45,19 +45,11 @@
 $(eval $(call VerifyVariable,JT_HOME))
 $(eval $(call VerifyVariable,JDK_IMAGE_DIR))
 $(eval $(call VerifyVariable,TEST_IMAGE_DIR))
+$(eval $(call VerifyVariable,MAKE))
+$(eval $(call VerifyVariable,BASH))
 
 # FIXMEs
 
-# verify that we have:
-# MAKE
-# BASH
-
-# FIXME
-export BASH := bash
-
-
-
-#SPEC :=
 FIXPATH :=
 CYGPATH := cygpath
 
@@ -131,9 +123,6 @@
 OPENJDK_TARGET_CPU_BITS := $(OPENJDK_BUILD_CPU_BITS)
 OPENJDK_TARGET_CPU_ENDIAN := $(OPENJDK_BUILD_CPU_ENDIAN)
 
-# FIXME: Can we remove this?
-HOTSPOT_TOPDIR:=$(TOPDIR)/hotspot
-
 SUPPORT_OUTPUTDIR := $(OUTPUTDIR)/support
 BUILDTOOLS_OUTPUTDIR := $(OUTPUTDIR)/buildtools