--- /dev/null	2020-01-17 11:46:19.065201212 +0100
+++ new/test/hotspot/jtreg/gc/shenandoah/jni/TestJNICritical.java	2020-01-17 17:11:23.091126457 +0100
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2016, 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ */
+
+/* @test TestJNICritical
+ * @summary test JNI critical arrays support in Shenandoah
+ * @key gc
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ *
+ * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ShenandoahVerify                 TestJNICritical
+ * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive TestJNICritical
+ */
+
+import java.util.Arrays;
+
+public class TestJNICritical {
+    static {
+        System.loadLibrary("TestJNICritical");
+    }
+
+    private static final int NUM_RUNS   = 10000;
+    private static final int ARRAY_SIZE = 10000;
+    private static int[] a;
+    private static int[] b;
+
+    private static native void copyAtoB(int[] a, int[] b);
+
+    public static void main(String[] args) {
+        a = new int[ARRAY_SIZE];
+        b = new int[ARRAY_SIZE];
+        for (int i = 0; i < NUM_RUNS; i++) {
+            test();
+        }
+    }
+
+    private static void test() {
+        int[] a1 = new int[ARRAY_SIZE];
+        int[] b1 = new int[ARRAY_SIZE];
+        fillArray(a);
+        copyAtoB(a, b);
+        copyAtoB(a1, b1); // Don't optimize out garbage arrays.
+        if (!Arrays.equals(a, b)) {
+            throw new RuntimeException("arrays not equal");
+        }
+    }
+
+    private static void fillArray(int[] array) {
+        for (int i = 0; i < ARRAY_SIZE; i++) {
+            int val = (int) (Math.random() * Integer.MAX_VALUE);
+            array[i] = val;
+        }
+    }
+}