--- old/test/lib/jdk/test/lib/jfr/GCHelper.java	2018-10-19 10:54:29.000000000 -0400
+++ new/test/lib/jdk/test/lib/jfr/GCHelper.java	2018-10-19 10:54:29.000000000 -0400
@@ -35,6 +35,8 @@
 import java.io.PrintStream;
 import java.lang.management.GarbageCollectorMXBean;
 import java.lang.management.ManagementFactory;
+import com.sun.management.HotSpotDiagnosticMXBean;
+import com.sun.management.VMOption;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -171,12 +173,16 @@
     static {
         // young GarbageCollectionMXBeans.
         beanCollectorTypes.put("G1 Young Generation", true);
+        beanCollectorTypes.put("G1 Young", true);
         beanCollectorTypes.put("Copy", true);
         beanCollectorTypes.put("PS Scavenge", true);
         beanCollectorTypes.put("ParNew", true);
 
         // old GarbageCollectionMXBeans.
         beanCollectorTypes.put("G1 Old Generation", false);
+        beanCollectorTypes.put("G1 Mixed", false);
+        beanCollectorTypes.put("G1 Concurrent Cycle", false);
+        beanCollectorTypes.put("G1 Full", false);
         beanCollectorTypes.put("ConcurrentMarkSweep", false);
         beanCollectorTypes.put("PS MarkSweep", false);
         beanCollectorTypes.put("MarkSweepCompact", false);