--- a/jdk/make/jprt.properties	Fri Jun 08 09:22:30 2012 -0400
+++ b/jdk/make/jprt.properties	Fri Jun 08 05:39:14 2012 -0700
@@ -89,6 +89,7 @@
     ${jprt.my.test.target.set:TESTNAME=jdk_text},               \
     ${jprt.my.test.target.set:TESTNAME=jdk_tools1},             \
     ${jprt.my.test.target.set:TESTNAME=jdk_tools2},             \
+    ${jprt.my.test.target.set:TESTNAME=jdk_jfr},                \
     ${jprt.my.test.target.set:TESTNAME=jdk_misc}
 
 # All vm test targets (testset=all)

--- a/jdk/test/Makefile	Fri Jun 08 09:22:30 2012 -0400
+++ b/jdk/test/Makefile	Fri Jun 08 05:39:14 2012 -0700
@@ -609,6 +609,16 @@
 jdk_tools: jdk_tools1 jdk_tools2
 	@$(SummaryInfo)
 
+# Stable othervm testruns (minus items from PROBLEM_LIST)
+#   Using agentvm has serious problems with these tests
+ifdef OPENJDK
+jdk_jfr:
+else
+JDK_ALL_TARGETS += jdk_jfr
+jdk_jfr: $(call TestDirs, com/oracle/jfr)
+	$(call RunOthervmBatch)
+endif
+
 # Stable agentvm testruns (minus items from PROBLEM_LIST)
 JDK_ALL_TARGETS += jdk_util
 JDK_DEFAULT_TARGETS += jdk_util