--- /dev/null	2018-07-05 16:03:01.952496000 +0100
+++ new/test/jdk/jdk/jfr/event/security/TestCertificateChainEvent.java	2018-07-10 13:46:33.326516592 +0100
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+package jdk.jfr.event.security;
+
+import java.util.List;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+import jdk.test.lib.security.TestCertificate;
+
+/*
+ * @test
+ * @bug 8148188
+ * @summary Enhance the security libraries to record events of interest
+ * @key jfr
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.event.security.TestCertificateChainEvent
+ */
+public class TestCertificateChainEvent {
+    public static void main(String[] args) throws Exception {
+        try (Recording recording = new Recording()) {
+            recording.enable(EventNames.CertificateChain);
+            recording.start();
+            TestCertificate.generateChain();
+            recording.stop();
+
+            List<RecordedEvent> events = Events.fromRecording(recording);
+            Events.hasEvents(events);
+            assertEvent(events);
+        }
+    }
+
+    private static void assertEvent(List<RecordedEvent> events) throws Exception {
+        String expectedValue = TestCertificate.TWO.serialNumber+ ", " + TestCertificate.ONE.serialNumber;
+        for (RecordedEvent e : events) {
+            Events.assertField(e, "serialNumbers").equal(expectedValue);
+            return;
+        }
+        System.out.println(events);
+        throw new Exception("Could not find TestCertificateChainEvent with value=" + expectedValue);
+    }
+}
\ No newline at end of file