--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestRegistered.java	Tue May 15 20:24:34 2018 +0200
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2015, 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.metadata.annotations;
+
+import jdk.jfr.Registered;
+import jdk.test.lib.Asserts;
+import jdk.jfr.Event;
+import jdk.jfr.EventType;
+import jdk.jfr.FlightRecorder;
+
+/*
+ * @test
+ * @key jfr
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.api.metadata.annotations.TestRegistered
+ */
+public class TestRegistered {
+
+    static class RegisteredByDefaultEvent extends Event {
+    }
+
+    @Registered(false)
+    static class NotRegisteredByDefaultEvent extends Event {
+    }
+
+    public static void main(String[] args) throws Exception {
+        try {
+            EventType.getEventType(NotRegisteredByDefaultEvent.class);
+            throw new Exception("Should not be able to get event type from unregistered event type");
+        } catch (IllegalStateException ise) {
+            // as expected
+        }
+        EventType registered = EventType.getEventType(RegisteredByDefaultEvent.class);
+        boolean registeredWorking = false;
+        for (EventType type : FlightRecorder.getFlightRecorder().getEventTypes()) {
+            if (registered.getId() == type.getId()) {
+                registeredWorking = true;
+            }
+        }
+        if (!registeredWorking) {
+            Asserts.fail("Default regsitration is not working, can't validate @NoAutoRegistration");
+        }
+    }
+}