diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
index aee56a2c877..70d68f97c7e 100644
--- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
+++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
@@ -70,13 +70,11 @@ public class GenerateRangesCodegenTestData {
     private static final Map<String, String> ELEMENT_TYPE_KNOWN_SUBSTRINGS = new HashMap<>();
     private static final Map<String, String> MIN_MAX_CONSTANTS = new LinkedHashMap<>();
 
-    private static final List<String> FIR_PASSING_UNSIGNED_LITERAL_TESTS =
-            Arrays.asList("emptyDownto", "emptyRange", "oneElementDownTo", "oneElementRange", "reversedEmptyBackSequence",
-                          "reversedEmptyRange");
-
-    private static final List<String> FIR_PASSING_UNSIGNED_EXPRESSION_TESTS =
-            Arrays.asList("emptyDownto", "emptyRange", "oneElementDownTo", "oneElementRange", "reversedEmptyBackSequence",
-                          "reversedEmptyRange");
+    private static final List<String> FIR_FAILING_UNSIGNED_TESTS =
+            Arrays.asList("inexactDownToMinValue", "inexactToMaxValue", "maxValueMinusTwoToMaxValue", "maxValueToMaxValue",
+                          "maxValueToMinValue", "overflowZeroDownToMaxValue", "overflowZeroToMinValue", "progressionDownToMinValue",
+                          "progressionMaxValueMinusTwoToMaxValue", "progressionMaxValueToMaxValue", "progressionMaxValueToMinValue",
+                          "progressionMinValueToMinValue");
 
     static {
         for (String integerType : INTEGER_PRIMITIVES) {
@@ -234,12 +232,13 @@ public class GenerateRangesCodegenTestData {
                     }
 
                     String fileName = testFunName + ".kt";
+                    boolean isFirFailingUnsignedTest = FIR_FAILING_UNSIGNED_TESTS.contains(testFunName);
                     writeToFile(new File(AS_LITERAL_DIR, fileName), asLiteralBody.toString(), false, false);
                     writeToFile(new File(AS_EXPRESSION_DIR, fileName), asExpressionBody.toString(), false, false);
                     writeToFile(new File(UNSIGNED_AS_LITERAL_DIR, fileName), unsignedAsLiteralBody.toString(), true,
-                                !FIR_PASSING_UNSIGNED_LITERAL_TESTS.contains(testFunName));
+                                isFirFailingUnsignedTest);
                     writeToFile(new File(UNSIGNED_AS_EXPRESSION_DIR, fileName), unsignedAsExpressionBody.toString(), true,
-                                !FIR_PASSING_UNSIGNED_EXPRESSION_TESTS.contains(testFunName));
+                                isFirFailingUnsignedTest);
                 }
             }
         }