diff --git a/src/main/java/com/google/devtools/build/lib/runtime/RetainedHeapLimiter.java b/src/main/java/com/google/devtools/build/lib/runtime/RetainedHeapLimiter.java
index b5997b3d360561..f8f49328fbc30c 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/RetainedHeapLimiter.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/RetainedHeapLimiter.java
@@ -241,6 +241,8 @@ private static boolean isTenuredSpace(String name) {
     return "CMS Old Gen".equals(name)
         || "G1 Old Gen".equals(name)
         || "PS Old Gen".equals(name)
-        || "Tenured Gen".equals(name);
+        || "Tenured Gen".equals(name)
+        || "Shenandoah".equals(name)
+        || "ZHeap".equals(name);
   }
 }