--- old/test/hotspot/jtreg/gc/ergonomics/TestInitialGCThreadLogging.java	2018-11-28 19:19:28.392263436 +0100
+++ new/test/hotspot/jtreg/gc/ergonomics/TestInitialGCThreadLogging.java	2018-11-28 19:19:28.231264564 +0100
@@ -29,10 +29,14 @@
  * @key gc
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestInitialGCThreadLogging
  */
 
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
+import sun.hotspot.gc.GC;
 
 public class TestInitialGCThreadLogging {
   public static void main(String[] args) throws Exception {
@@ -43,7 +47,9 @@
 
     testInitialGCThreadLogging("UseParallelGC", "ParGC Thread");
 
-    testInitialGCThreadLogging("UseShenandoahGC", "Shenandoah GC Thread");
+    if (GC.Shenandoah.isSupported()) {
+        testInitialGCThreadLogging("UseShenandoahGC", "Shenandoah GC Thread");
+    }
   }
 
   private static void verifyDynamicNumberOfGCThreads(OutputAnalyzer output, String threadName) {