--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/jfr/api/event/TestEventFactoryRegistration.java	Tue May 15 20:24:34 2018 +0200
@@ -0,0 +1,105 @@
+/*
+ * 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.  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.api.event;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import jdk.jfr.AnnotationElement;
+import jdk.jfr.EventFactory;
+import jdk.jfr.EventType;
+import jdk.jfr.FlightRecorder;
+import jdk.jfr.Registered;
+import jdk.test.lib.Asserts;
+
+
+/*
+ * @test
+ * @summary EventFactory register/unregister API test
+ * @key jfr
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.api.event.TestEventFactoryRegistration
+ */
+public class TestEventFactoryRegistration {
+
+    public static void main(String[] args) throws Exception {
+        // Create an unregistered event
+        List<AnnotationElement> annotations = new ArrayList<>();
+        annotations.add(new AnnotationElement(Registered.class, false));
+        EventFactory factory = EventFactory.create(annotations, Collections.emptyList());
+
+        try {
+            factory.getEventType();
+            Asserts.fail("Should not be able to get event type from an unregistered event");
+        } catch(IllegalStateException ise) {
+            // OK as expected
+        }
+
+        // Now, register the event
+        factory.register();
+        EventType eventType = factory.getEventType();
+        verifyRegistered(factory.getEventType());
+
+
+        // Now, unregister the event
+        factory.unregister();
+
+        verifyUnregistered(eventType);
+
+        // Create a registered event
+        factory = EventFactory.create(Collections.emptyList(), Collections.emptyList());
+
+        eventType = factory.getEventType();
+        Asserts.assertNotNull(eventType);
+
+        verifyRegistered(eventType);
+
+    }
+
+    private static void verifyUnregistered(EventType eventType) {
+        // Verify the event is not registered
+        for (EventType type : FlightRecorder.getFlightRecorder().getEventTypes()) {
+            if (eventType.getId() == type.getId()) {
+                Asserts.fail("Event is not unregistered");
+            }
+        }
+    }
+
+    private static void verifyRegistered(EventType eventType) {
+        // Verify  the event is registered
+        boolean found = false;
+        for (EventType type : FlightRecorder.getFlightRecorder().getEventTypes()) {
+            if (eventType.getId() == type.getId()) {
+                found = true;
+            }
+        }
+        if(!found) {
+            Asserts.fail("Event not registered");
+        }
+    }
+
+}