--- a/make/Main.gmk	Wed Oct 21 13:39:10 2015 +0200
+++ b/make/Main.gmk	Thu Oct 22 15:28:49 2015 +0200
@@ -301,6 +301,9 @@
 test:
 	$(call RunTests, $(TEST))
 
+test-hotspot-jtreg:
+	$(call RunTests, "hotspot_all")
+
 test-hotspot-jtreg-native:
 	$(call RunTests, "hotspot_native_sanity")
 
@@ -313,8 +316,8 @@
 test-make:
 	($(CD) $(SRC_ROOT)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
 
-ALL_TARGETS += test test-hotspot-jtreg-native test-hotspot-internal \
-    test-jdk-jtreg-native test-make
+ALL_TARGETS += test test-hotspot-jtreg test-hotspot-jtreg-native \
+    test-hotspot-internal test-jdk-jtreg-native test-make
 
 ################################################################################
 # Verification targets
@@ -475,6 +478,8 @@
 
   test-hotspot-internal: exploded-image
 
+  test-hotspot-jtreg: jimages test-image
+
 endif
 
 ################################################################################