diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckWidths.java b/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckWidths.java
index 110bc377688..5c60a8aa8ca 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckWidths.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckWidths.java
@@ -35,9 +35,9 @@ public class CheckWidths extends CheckCLDR {
     private static UnitWidthUtil UNIT_WIDTHS_UTIL = UnitWidthUtil.getInstance();
 
     /** Controls for the warning about too many components, and for when to cause error. */
-    public static final int WARN_COMPONENTS_PER_ANNOTATION = 7;
+    public static final int WARN_COMPONENTS_PER_ANNOTATION = 10;
 
-    public static final int MAX_COMPONENTS_PER_ANNOTATION = 16;
+    public static final int MAX_COMPONENTS_PER_ANNOTATION = 30;
 
     SupplementalDataInfo supplementalData;