diff --git a/test/Makefile b/test/Makefile
index e91844ecebbdf49fd43493abdc8d492c0a77e28c..447619b4716328ec9cee705d8ece505cb184c96c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -119,11 +119,11 @@ TEST_ROOT := $(shell pwd)
 
 # Root of all test results
 ifdef ALT_OUTPUTDIR
-  ABS_BUILD_ROOT = $(ALT_OUTPUTDIR)/$(PLATFORM)-$(ARCH)
+  ABS_BUILD_ROOT = $(ALT_OUTPUTDIR)
 else
   ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)
 endif
-ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput
+ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput/$(UNIQUE_DIR)
 
 # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test)
 ifndef PRODUCT_HOME
@@ -267,7 +267,7 @@ JTREG_BASIC_OPTIONS += -agentvm
 # Only run automatic tests
 JTREG_BASIC_OPTIONS += -a
 # Report details on all failed or error tests, times too
-JTREG_BASIC_OPTIONS += -v:fail,error,time
+JTREG_BASIC_OPTIONS += -v:fail,error,summary
 # Retain all files for failing tests
 JTREG_BASIC_OPTIONS += -retain:fail,error
 # Ignore tests are not run and completely silent about it
diff --git a/test/TEST.groups b/test/TEST.groups
index 40750364ba271fa32edf7b8e9b3abc24dbfc2d26..216e307cf14414cc8920baa941c37da025cc18cd 100644
--- a/test/TEST.groups
+++ b/test/TEST.groups
@@ -124,7 +124,6 @@ compact3 = \
  -:needs_jre \
  -:needs_jdk
 
-
 # When called from top level the test suites use the hotspot_ prefix
 hotspot_wbapitest = \
   sanity/
@@ -147,6 +146,11 @@ hotspot_all = \
   :hotspot_gc \
   :hotspot_runtime \
   :hotspot_serviceability
+
+# Right now tier1 runs all hotspot tests
+hotspot_tier1 = \
+  :jdk
+
 # Tests that require compact3 API's
 #
 needs_compact3 = \