--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/appcds/CDSandJFR.java	Tue May 15 20:24:34 2018 +0200
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @summary Make sure CDS and JFR work together.
+ * @requires vm.cds
+ * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes test-classes
+ * @modules jdk.jfr
+ * @build Hello GetFlightRecorder
+ * @run driver ClassFileInstaller -jar CDSandJFR.jar Hello GetFlightRecorder GetFlightRecorder$TestEvent GetFlightRecorder$SimpleEvent
+ * @run main CDSandJFR
+ */
+
+import jdk.test.lib.BuildHelper;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class CDSandJFR {
+    static String[] classes = {
+        "jdk/jfr/Event",
+        "jdk/jfr/events/FileReadEvent",
+        "jdk/jfr/events/FileWriteEvent",
+        "jdk/jfr/events/SocketReadEvent",
+        "jdk/jfr/events/SocketWriteEvent",
+        "jdk/jfr/events/ExceptionThrownEvent",
+        "jdk/jfr/events/ExceptionStatisticsEvent",
+        "jdk/jfr/events/ErrorThrownEvent",
+        "jdk/jfr/events/ActiveSettingEvent",
+        "jdk/jfr/events/ActiveRecordingEvent",
+        "Hello",
+        "GetFlightRecorder",
+        "GetFlightRecorder$TestEvent",
+    };
+
+    public static void main(String[] args) throws Exception {
+        test(classes);
+    }
+
+    static void test(String[] classes) throws Exception {
+        String appJar = ClassFileInstaller.getJarPath("CDSandJFR.jar");
+        OutputAnalyzer output;
+        output = TestCommon.testDump(appJar, TestCommon.list(classes));
+        TestCommon.checkDump(output, "Skipping JFR event class jdk/jfr/");
+
+        output = TestCommon.exec(appJar,
+                                 "-XX:StartFlightRecording=dumponexit=true",
+                                 "Hello");
+        TestCommon.checkExec(output, "Hello World");
+
+        TestCommon.checkExec(TestCommon.exec(appJar,
+                                             "-XX:FlightRecorderOptions=retransform=true",
+                                             "GetFlightRecorder"));
+        TestCommon.checkExec(TestCommon.exec(appJar,
+                                             "-XX:FlightRecorderOptions=retransform=false",
+                                             "GetFlightRecorder"));
+    }
+}