diff --git a/make/jprt.properties b/make/jprt.properties
index a6d2ea1d0d4c7d8d94ef4f304afc6acd38e4d5f5..8f7038e1f3b62915a9e60c1cca37976e81d56553 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -63,6 +63,7 @@ jprt.vm.default.test.targets=					\
     ${jprt.my.test.target.set:TESTNAME=jvm98}
 
 # Default jdk test targets (testset=default)
+# NOTE: This does not match test/Makefile :: jdk_default
 jprt.make.rule.default.test.targets=				\
     ${jprt.my.test.target.set:TESTNAME=jdk_lang},               \
     ${jprt.my.test.target.set:TESTNAME=jdk_math}
@@ -72,6 +73,7 @@ jprt.vm.core.test.targets=                                      \
     ${jprt.vm.default.test.targets}
 
 # Core jdk test targets (testset=core)
+# NOTE: please keep this in sync with test/Makefile :: jdk_core
 jprt.make.rule.core.test.targets=                               \
     ${jprt.make.rule.default.test.targets},                     \
     ${jprt.my.test.target.set:TESTNAME=jdk_util},               \
@@ -97,6 +99,7 @@ jprt.vm.all.test.targets=                                       \
     ${jprt.my.test.target.set:TESTNAME=jbb_default}
 
 # All jdk test targets (testset=all)
+# NOTE: This does not match test/Makefile :: jdk_all
 jprt.make.rule.all.test.targets=    				\
     ${jprt.make.rule.core.test.targets}, 			\
     ${jprt.my.test.target.set:TESTNAME=jdk_awt},                \
diff --git a/test/Makefile b/test/Makefile
index 408aaaeed251c5bd967a56e61ae30a8acdd77896..093d4649b218d1f3042032ed557e42fa239c82e5 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -342,8 +342,8 @@ prep: clean
 
 # Cleanup
 clean:
-	$(RM) -r $(ABS_TEST_OUTPUT_DIR)
-	$(RM) $(ARCHIVE_BUNDLE)
+	@$(RM) -r $(ABS_TEST_OUTPUT_DIR)
+	@$(RM) $(ARCHIVE_BUNDLE)
 
 ################################################################
 
@@ -401,7 +401,7 @@ $(EXCLUDELIST): $(PROBLEM_LISTS) $(TEST_DEPENDENCIES)
           ($(ECHO) "#") ;\
         ) | $(SED) -e 's@^[\ ]*@@' \
           | $(EGREP) -v '^#' > $@.temp1
-	for tdir in $(TESTDIRS) SOLARIS_10_SH_BUG_NO_EMPTY_FORS ; do \
+	@for tdir in $(TESTDIRS) SOLARIS_10_SH_BUG_NO_EMPTY_FORS ; do \
           ( ( $(CAT) $@.temp1 | $(EGREP) "^$${tdir}" ) ; $(ECHO) "#" ) >> $@.temp2 ; \
         done
 	@$(ECHO) "# at least one line" >> $@.temp2
@@ -431,6 +431,7 @@ endef
 # ------------------------------------------------------------------
 
 # Batches of tests (somewhat arbitrary assigments to jdk_* targets)
+# NOTE: These *do not* run the same tests as make/jprt.properties
 JDK_DEFAULT_TARGETS =
 JDK_ALL_TARGETS =
 
@@ -614,15 +615,24 @@ jdk_util: $(call TestDirs, java/util sun/util)
 # ------------------------------------------------------------------
 
 # Run default tests
+# note that this *does not* have the same meaning as jprt.properties :: jprt.make.rule.default.test.targets
 jdk_default: $(JDK_DEFAULT_TARGETS)
 	@$(SummaryInfo)
 
+# Run core tests
+# please keep this in sync with jdk/make/jprt.properties :: jprt.make.rule.core.test.targets
+jdk_core: jdk_lang jdk_math jdk_util jdk_io jdk_net jdk_nio \
+        jdk_security1 jdk_security2 jdk_security3 jdk_rmi \
+        jdk_management jdk_jmx jdk_text jdk_tools jdk_jfr jdk_other
+	@$(SummaryInfo)
+
 # Run all tests
+# note that this *does not* have the same meaning as jprt.properties :: jprt.make.rule.all.test.targets
 jdk_all: $(JDK_ALL_TARGETS)
 	@$(SummaryInfo)
 
 # These are all phony targets
-PHONY_LIST += $(JDK_ALL_TARGETS)
+PHONY_LIST += $(JDK_ALL_TARGETS) jdk_default jdk_core jdk_all
 
 # ------------------------------------------------------------------
 
@@ -892,4 +902,3 @@ PHONY_LIST += jck_all _generic_jck_tests \
 .PHONY: all clean prep $(PHONY_LIST)
 
 ################################################################
-
diff --git a/test/ProblemList.txt b/test/ProblemList.txt
index 692550743265fdbc07174aeae1c7639361fa36b1..840a9274293d25bcc290d0d4ba5297583c7f83b2 100644
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -45,8 +45,8 @@
 #   as to why they are here and use a label:
 #     generic-all       Problems on all platforms
 #     generic-ARCH      Where ARCH is one of: sparc, sparcv9, x64, i586, etc.
-#     OSNAME-all        Where OSNAME is one of: solaris, linux, windows
-#     OSNAME-ARCH       Specific on to one OSNAME and ARCH, e.g. solaris-x64
+#     OSNAME-all        Where OSNAME is one of: solaris, linux, windows, macosx
+#     OSNAME-ARCH       Specific on to one OSNAME and ARCH, e.g. solaris-amd64
 #     OSNAME-REV        Specific on to one OSNAME and REV, e.g. solaris-5.8
 #
 # More than one label is allowed but must be on the same line.