--- /dev/null	2017-11-09 09:38:01.297999907 +0100
+++ new/test/jdk/jdk/jfr/event/runtime/TestClassLoadEvent.java	2018-04-09 18:26:03.242924118 +0200
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2013, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package jdk.jfr.event.runtime;
+
+import java.time.Duration;
+import java.util.List;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedClass;
+import jdk.jfr.consumer.RecordedClassLoader;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+import jdk.test.lib.jfr.TestClassLoader;
+
+/*
+ * @test
+ * @key jfr
+ * @library /test/lib /test/jdk
+ * @build jdk.jfr.event.runtime.TestClasses
+ * @run main/othervm jdk.jfr.event.runtime.TestClassLoadEvent
+ */
+public final class TestClassLoadEvent {
+
+    private final static String TEST_CLASS_NAME = "jdk.jfr.event.runtime.TestClasses";
+    private final static String BOOT_CLASS_LOADER_NAME = "boot";
+    private final static String SEARCH_CLASS_NAME = "java.lang.Object";
+    private final static String SEARCH_PACKAGE_NAME = "java/lang";
+    private final static String SEARCH_MODULE_NAME = "java.base";
+    private final static String EVENT_NAME = EventNames.ClassLoad;
+
+    public static void main(String[] args) throws Throwable {
+        Recording recording = new Recording();
+        recording.enable(EVENT_NAME).withThreshold(Duration.ofMillis(0));
+        TestClassLoader cl = new TestClassLoader();
+        recording.start();
+        cl.loadClass(TEST_CLASS_NAME);
+        recording.stop();
+
+        List<RecordedEvent> events = Events.fromRecording(recording);
+        boolean isLoaded = false;
+        for (RecordedEvent event : events) {
+            RecordedClass loadedClass = event.getValue("loadedClass");
+            if (SEARCH_CLASS_NAME.equals(loadedClass.getName())) {
+                System.out.println(event);
+                Events.assertClassPackage(loadedClass, SEARCH_PACKAGE_NAME);
+                Events.assertClassModule(loadedClass, SEARCH_MODULE_NAME);
+                RecordedClassLoader initiatingClassLoader = event.getValue("initiatingClassLoader");
+                Asserts.assertEquals(cl.getClass().getName(), initiatingClassLoader.getType().getName(),
+                    "Expected type " + cl.getClass().getName() + ", got type " + initiatingClassLoader.getType().getName());
+                RecordedClassLoader definingClassLoader = loadedClass.getClassLoader();
+                Asserts.assertEquals(BOOT_CLASS_LOADER_NAME, definingClassLoader.getName(),
+                    "Expected boot loader to be the defining class loader");
+                Asserts.assertNull(definingClassLoader.getType(), "boot loader should not have a type");
+                isLoaded = true;
+            }
+        }
+        Asserts.assertTrue(isLoaded, "No class load event found for class " + SEARCH_CLASS_NAME);
+    }
+}