--- old/src/hotspot/share/gc/shared/gcConfiguration.cpp	2018-11-26 21:29:46.928250769 +0100
+++ new/src/hotspot/share/gc/shared/gcConfiguration.cpp	2018-11-26 21:29:46.772252145 +0100
@@ -43,7 +43,7 @@
     return ParNew;
   }
 
-  if (UseZGC) {
+  if (UseZGC || UseShenandoahGC) {
     return NA;
   }
 
@@ -67,6 +67,10 @@
     return Z;
   }
 
+  if (UseShenandoahGC) {
+    return Shenandoah;
+  }
+
   return SerialOld;
 }