diff --git a/make/Makefile b/make/Makefile
index afbe68ee0c5b639b1c1e937a35e3eed8f48865ea..8bebef46972d5be1d1ad293692e8176551698715 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -402,7 +402,6 @@ $(EXPORT_INCLUDE_DIR)/%: $(HS_ALT_SRC)/share/vm/jfr/agent/%
 	$(install-file)
 else
 $(EXPORT_INCLUDE_DIR)/jfr.h:
-	
 endif
 
 # Doc files (jvmti.html)
@@ -448,12 +447,18 @@ $(JDK_IMAGE_DIR)/jre/lib/rt.jar:
 	 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
 
 test_jdk:
-  ifneq ($(ZERO_BUILD), true)
     ifeq ($(ARCH_DATA_MODEL), 32)
-	$(JDK_IMAGE_DIR)/bin/java -client -version
+      ifneq ($(ZERO_BUILD), true)
+	$(JDK_IMAGE_DIR)/bin/java -d32 -client -Xinternalversion
+	$(JDK_IMAGE_DIR)/bin/java -d32 -client -version
+      endif
+	$(JDK_IMAGE_DIR)/bin/java -d32 -server -Xinternalversion
+	$(JDK_IMAGE_DIR)/bin/java -d32 -server -version
+    endif
+    ifeq ($(ARCH_DATA_MODEL), 64)
+	$(JDK_IMAGE_DIR)/bin/java -d64 -server -Xinternalversion
+	$(JDK_IMAGE_DIR)/bin/java -d64 -server -version
     endif
-  endif
-	$(JDK_IMAGE_DIR)/bin/java -server -version
 
 copy_product_jdk::
 	$(RM) -r $(JDK_IMAGE_DIR)
@@ -545,6 +550,7 @@ SLASH_JAVA.desc            = Root of all build tools, e.g. /java or J:
 OUTPUTDIR.desc             = Output directory, default is build/<osname>
 BOOTDIR.desc               = JDK used to compile agent java source and test with
 JDK_IMPORT_PATH.desc       = Promoted JDK to copy for 'create_jdk'
+JDK_IMAGE_DIR.desc         = Directory to place JDK to copy
 EXPORT_PATH.desc           = Directory to place files to export for JDK build
 
 # Make variables to print out (description and value)
@@ -553,6 +559,7 @@ VARIABLE_PRINTVAL_LIST +=       \
     OUTPUTDIR                   \
     BOOTDIR                     \
     JDK_IMPORT_PATH             \
+    JDK_IMAGE_DIR               \
     EXPORT_PATH
 
 # Make variables that should refer to directories that exist
diff --git a/make/bsd/makefiles/defs.make b/make/bsd/makefiles/defs.make
index f442a059635c2d901a1520daf68bee4b8776c77a..7048970bcf875e6ec39da43b04ed85f9a79c4f09 100644
--- a/make/bsd/makefiles/defs.make
+++ b/make/bsd/makefiles/defs.make
@@ -191,6 +191,9 @@ ifeq ($(OS_VENDOR), Darwin)
 
     # Set universal image dir
     JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR)
+    ifneq ($(ALT_JDK_IMAGE_DIR),)
+      JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
+    endif
 
     # Binaries to 'universalize' if built
     UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
diff --git a/make/bsd/makefiles/top.make b/make/bsd/makefiles/top.make
index 7b237c467d737f2dc6aec92ae3e5334a9b785cbb..934e5d1f470c22f923625a8d984b8d54153c1ba1 100644
--- a/make/bsd/makefiles/top.make
+++ b/make/bsd/makefiles/top.make
@@ -124,8 +124,8 @@ the_vm: vm_build_preliminaries $(adjust-mflags)
 	@$(UpdatePCH)
 	@$(MAKE) -f vm.make $(MFLAGS-adjusted)
 
-install: the_vm
-	@$(MAKE) -f vm.make install
+install gamma: the_vm
+	@$(MAKE) -f vm.make $@
 
 # next rules support "make foo.[ois]"
 
diff --git a/make/defs.make b/make/defs.make
index af6d7be19849302ca037a75377c1f68c35a47e64..a0aa0e5c8598f09ddae55fe15b5d03272ac85725 100644
--- a/make/defs.make
+++ b/make/defs.make
@@ -193,6 +193,9 @@ endif
 
 # Default jdk image if one is created for you with create_jdk
 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
+ifneq ($(ALT_JDK_IMAGE_DIR),)
+  JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
+endif
 
 # The platform dependent defs.make defines platform specific variable such 
 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
diff --git a/make/linux/makefiles/top.make b/make/linux/makefiles/top.make
index d89f8ff75d22663fabafca8f4b956ecb5e936e1e..3f6e73ebc1b92c6a7cd95a368bd3710f25302e12 100644
--- a/make/linux/makefiles/top.make
+++ b/make/linux/makefiles/top.make
@@ -115,8 +115,8 @@ the_vm: vm_build_preliminaries $(adjust-mflags)
 	@$(UpdatePCH)
 	@$(MAKE) -f vm.make $(MFLAGS-adjusted)
 
-install: the_vm
-	@$(MAKE) -f vm.make install
+install gamma: the_vm
+	@$(MAKE) -f vm.make $@
 
 # next rules support "make foo.[ois]"
 
diff --git a/make/solaris/makefiles/top.make b/make/solaris/makefiles/top.make
index 64797bbb2fda2f18fbe1e6cdf2ec083da9303c7a..bbe10798ff547f95b8fc14d5f4352b26aa8f494c 100644
--- a/make/solaris/makefiles/top.make
+++ b/make/solaris/makefiles/top.make
@@ -107,8 +107,8 @@ $(adjust-mflags): $(GAMMADIR)/make/$(Platform_os_family)/makefiles/adjust-mflags
 the_vm: vm_build_preliminaries $(adjust-mflags)
 	@$(MAKE) -f vm.make $(MFLAGS-adjusted)
 
-install: the_vm
-	@$(MAKE) -f vm.make install
+install gamma: the_vm
+	@$(MAKE) -f vm.make $@
 
 # next rules support "make foo.[oi]"