--- /dev/null	2015-10-08 07:26:57.000000000 -1000
+++ new/test/compiler/jvmci/events/JvmciShutdownEventListener.java	2015-10-08 07:26:57.000000000 -1000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2015, 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 compiler.jvmci.events;
+
+import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
+import jdk.vm.ci.hotspot.HotSpotVMEventListener;
+
+public class JvmciShutdownEventListener implements HotSpotVMEventListener {
+    public static final String MESSAGE = "Shutdown notified";
+    public static final String GOT_INTERNAL_ERROR = "Got internal error";
+
+    public static void main(String args[]) {
+        try {
+            HotSpotJVMCIRuntime.runtime(); // let's trigger that lazy jvmci init
+        } catch (InternalError e) {
+            System.out.println(GOT_INTERNAL_ERROR);
+        }
+    }
+
+    @Override
+    public void notifyShutdown() {
+        System.out.println(MESSAGE);
+    }
+}