diff --git a/icu4c/source/test/intltest/numbertest_api.cpp b/icu4c/source/test/intltest/numbertest_api.cpp
index 83b8eb5..ac92349 100644
--- a/icu4c/source/test/intltest/numbertest_api.cpp
+++ b/icu4c/source/test/intltest/numbertest_api.cpp
@@ -2285,7 +2285,7 @@
             -123.12,
             u"RON-123.12");
 
-    // TODO(CLDR-13044): Move the sign to the inside of the number
+    // TODO(ICU-21420): Move the sign to the inside of the number
     assertFormatSingle(
             u"Sign position on negative number with currency spacing",
             u"currency/RON",
diff --git a/icu4c/source/test/intltest/numbertest_range.cpp b/icu4c/source/test/intltest/numbertest_range.cpp
index 1364c86..faab35d 100644
--- a/icu4c/source/test/intltest/numbertest_range.cpp
+++ b/icu4c/source/test/intltest/numbertest_range.cpp
@@ -987,7 +987,7 @@
         u"CHF≈5’000.00",
         u"CHF 5’000.00–5’000’000.00");
 
-    // TODO(CLDR-13044): Move the sign to the inside of the number
+    // TODO(ICU-21420): Move the sign to the inside of the number
     assertFormatRange(
         u"Approximately sign position with currency spacing",
         NumberRangeFormatter::with()
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java
index 6f5558e..a1c0e19 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java
@@ -2245,7 +2245,7 @@
                 -123.12,
                 "RON-123.12");
 
-        // TODO(CLDR-13044): Move the sign to the inside of the number
+        // TODO(ICU-21420): Move the sign to the inside of the number
         assertFormatSingle(
                 "Sign position on negative number with currency spacing",
                 "currency/RON",
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java
index 5696f01..23e7073 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java
@@ -917,7 +917,7 @@
             "CHF≈5’000.00",
             "CHF 5’000.00–5’000’000.00");
 
-        // TODO(CLDR-13044): Move the sign to the inside of the number
+        // TODO(ICU-21420): Move the sign to the inside of the number
         assertFormatRange(
             "Approximately sign position with currency spacing",
             NumberRangeFormatter.with()