diff --git a/make/jprt.properties b/make/jprt.properties
index 2e4e0fb8ac7263cbd50fdf024debafbf5a95678f..f41a227d30e69aa724e45af8e7af943a37536b2c 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -89,6 +89,7 @@ jprt.make.rule.core.test.targets=                               \
     ${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)
diff --git a/test/Makefile b/test/Makefile
index 0fd156b299e84797e5a9d99529b572e3dcbc7e5f..9f96ba405e772c3941af1b45d23bca3f030330d6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -609,6 +609,16 @@ jdk_tools2: $(call TestDirs, \
 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