--- 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