--- /dev/null	2019-05-06 12:15:55.902439824 -0400
+++ new/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionInformationEvent.java	2019-05-10 10:58:35.133347754 -0400
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2016, 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.gc.detailed;
+
+import java.nio.file.Paths;
+import java.util.List;
+
+import jdk.jfr.EventType;
+import jdk.jfr.FlightRecorder;
+import jdk.jfr.Recording;
+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.GCHelper;
+
+/**
+ * @test
+ * @bug 8221507
+ * @requires vm.hasJFR
+ * @requires vm.gc == "Shenandoah" | vm.gc == null
+ * @key jfr
+ * @library /test/lib /test/jdk
+ * @run main/othervm  -Xmx32m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGarbageThreshold=1 jdk.jfr.event.gc.detailed.TestShenandoahHeapRegionStateChangeEvent
+ */
+
+
+public class TestShenandoahHeapRegionInformationEvent {
+    private final static String EVENT_NAME = EventNames.ShenandoahHeapRegionInformation;
+    public static void main(String[] args) throws Exception {
+        Recording recording = null;
+        try {
+            recording = new Recording();
+            // activate the event we are interested in and start recording
+            for (EventType t : FlightRecorder.getFlightRecorder().getEventTypes()) {
+                System.out.println(t.getName());
+            }
+            recording.enable(EVENT_NAME);
+            recording.start();
+            recording.stop();
+
+            // Verify recording
+            List<RecordedEvent> events = Events.fromRecording(recording);
+            Events.hasEvents(events);
+
+            for (RecordedEvent event : events) {
+                Events.assertField(event, "index").notEqual(-1);
+                Asserts.assertTrue(GCHelper.isValidShenandoahHeapRegionState(Events.assertField(event, "type").getValue()));
+                Events.assertField(event, "used").atMost(1L*1024*1024);
+            }
+
+        } catch (Throwable t) {
+            if (recording != null) {
+                recording.dump(Paths.get("TestShenandoahHeapRegionInformationEvent.jfr"));
+            }
+            throw t;
+        } finally {
+            if (recording != null) {
+                recording.close();
+            }
+        }
+    }
+}