--- a/src/hotspot/share/gc/shared/gcConfiguration.cpp	Mon Dec 10 17:34:49 2018 +0300
+++ b/src/hotspot/share/gc/shared/gcConfiguration.cpp	Mon Dec 10 15:47:44 2018 +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;
 }