diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
index 9d7babd5d0a..8b9c8dbbfe8 100644
--- a/.github/workflows/build-common.yml
+++ b/.github/workflows/build-common.yml
@@ -117,7 +117,8 @@ jobs:
           - 8
           - 11
           - 17
-          - 18
+          - 21
+          - 23
         vm:
           - hotspot
           # TODO (trask) enable once profiler supports OpenJ9
diff --git a/agent/agent-gc-monitor/gc-monitor-tests/src/test/java/com/microsoft/gcmonitortests/VariousCollectorsTest.java b/agent/agent-gc-monitor/gc-monitor-tests/src/test/java/com/microsoft/gcmonitortests/VariousCollectorsTest.java
index 3cae349e251..b4c8ca40013 100644
--- a/agent/agent-gc-monitor/gc-monitor-tests/src/test/java/com/microsoft/gcmonitortests/VariousCollectorsTest.java
+++ b/agent/agent-gc-monitor/gc-monitor-tests/src/test/java/com/microsoft/gcmonitortests/VariousCollectorsTest.java
@@ -6,6 +6,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.condition.JRE.JAVA_11;
 import static org.junit.jupiter.api.condition.JRE.JAVA_13;
+import static org.junit.jupiter.api.condition.JRE.JAVA_17;
 import static org.junit.jupiter.api.condition.OS.LINUX;
 
 import com.microsoft.gcmonitor.GcCollectionEvent;
@@ -33,6 +34,7 @@ void testParallel() throws Exception {
   }
 
   @Test
+  @EnabledForJreRange(max = JAVA_17)
   void testG1() throws Exception {
     testGc("-XX:+UseG1GC", 50);
   }
@@ -42,7 +44,7 @@ void testSerial() throws Exception {
     testGc("-XX:+UseSerialGC", 50);
   }
 
-  @Disabled
+  @Disabled // see https://github.com/microsoft/ApplicationInsights-Java/pull/3083
   @Test
   @EnabledForJreRange(min = JAVA_11)
   void testShenandoah() throws Exception {