diff -r 877ab0d032b8 -r 068c4200829e make/Main.gmk
--- a/make/Main.gmk	Tue Dec 16 11:28:34 2014 +0100
+++ b/make/Main.gmk	Tue Dec 16 12:53:25 2014 +0100
@@ -257,7 +257,7 @@
 
 test:
 	($(CD) $(SRC_ROOT)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
-	    JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_OUTPUTDIR) \
+	    JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) \
 	    ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
 
 test-make:
@@ -394,7 +394,7 @@
 
   docs-jvmtidoc: hotspot
 
-  test: exploded-image
+  test: jimages
 
   verify-modules: exploded-image