--- /dev/null	2018-11-26 11:49:18.255023023 +0100
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java	2018-11-26 21:30:43.602750910 +0100
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2017, 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 TestHeuristicsUnlock
+ * @summary Test that Shenandoah heuristics are unlocked properly
+ * @key gc
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run driver TestHeuristicsUnlock
+ */
+
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class TestHeuristicsUnlock {
+
+    enum Mode {
+        PRODUCT,
+        DIAGNOSTIC,
+        EXPERIMENTAL,
+    }
+
+    public static void main(String[] args) throws Exception {
+        testWith("adaptive",        Mode.PRODUCT);
+        testWith("static",          Mode.PRODUCT);
+        testWith("compact",         Mode.PRODUCT);
+
+        testWith("traversal",       Mode.EXPERIMENTAL);
+
+        testWith("aggressive",      Mode.DIAGNOSTIC);
+        testWith("passive",         Mode.DIAGNOSTIC);
+    }
+
+    private static void testWith(String h, Mode mode) throws Exception {
+        if (false) { // When ShenandoahGC is experimental flag, this makes no sense to test
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                                    "-XX:-UnlockDiagnosticVMOptions",
+                                    "-XX:-UnlockExperimentalVMOptions",
+                                    "-XX:+UseShenandoahGC",
+                                    "-XX:ShenandoahGCHeuristics=" + h,
+                                    "-version"
+            );
+            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            switch (mode) {
+                case PRODUCT:
+                    output.shouldHaveExitValue(0);
+                    break;
+                case DIAGNOSTIC:
+                case EXPERIMENTAL:
+                    output.shouldNotHaveExitValue(0);
+                    break;
+            }
+        }
+
+        if (false) { // When ShenandoahGC is experimental flag, this makes no sense to test
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                                    "-XX:+UnlockDiagnosticVMOptions",
+                                    "-XX:-UnlockExperimentalVMOptions",
+                                    "-XX:+UseShenandoahGC",
+                                    "-XX:ShenandoahGCHeuristics=" + h,
+                                    "-version"
+            );
+            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            switch (mode) {
+                case PRODUCT:
+                case DIAGNOSTIC:
+                    output.shouldHaveExitValue(0);
+                    break;
+                case EXPERIMENTAL:
+                    output.shouldNotHaveExitValue(0);
+                    break;
+            }
+        }
+
+        {
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                                    "-XX:-UnlockDiagnosticVMOptions",
+                                    "-XX:+UnlockExperimentalVMOptions",
+                                    "-XX:+UseShenandoahGC",
+                                    "-XX:ShenandoahGCHeuristics=" + h,
+                                    "-version"
+            );
+            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            switch (mode) {
+                case PRODUCT:
+                case EXPERIMENTAL:
+                    output.shouldHaveExitValue(0);
+                    break;
+                case DIAGNOSTIC:
+                    output.shouldNotHaveExitValue(0);
+                    break;
+            }
+        }
+    }
+
+}