diff --git a/icu4c/source/i18n/name2uni.cpp b/icu4c/source/i18n/name2uni.cpp
index c59abc54d88..6b9f2a3fb3c 100644
--- a/icu4c/source/i18n/name2uni.cpp
+++ b/icu4c/source/i18n/name2uni.cpp
@@ -36,7 +36,7 @@ U_CDECL_BEGIN
 // Does not use uset.h to reduce code dependencies
 static void U_CALLCONV
 _set_add(USet *set, UChar32 c) {
-    ((UnicodeSet *)set)->add(c);
+    uset_add(set, c);
 }
 
 // These functions aren't used.
diff --git a/icu4c/source/test/intltest/rbbitst.cpp b/icu4c/source/test/intltest/rbbitst.cpp
index bb0ca50f71d..db5894aaa13 100644
--- a/icu4c/source/test/intltest/rbbitst.cpp
+++ b/icu4c/source/test/intltest/rbbitst.cpp
@@ -1563,9 +1563,9 @@ void RBBITest::TestExtended() {
             }
 
             errln("line %d: Tag expected in test file.", lineNum);
-            goto end_test;
             parseState = PARSE_COMMENT;
             savedState = PARSE_DATA;
+            goto end_test; // Stop the test.
             }
             break;
 
@@ -1742,8 +1742,8 @@ void RBBITest::TestExtended() {
 
             errln("Syntax Error in test file at line %d, col %d",
                 lineNum, column);
-            goto end_test;
             parseState = PARSE_COMMENT;
+            goto end_test; // Stop the test
             break;
         }
 
@@ -1751,8 +1751,8 @@ void RBBITest::TestExtended() {
         if (U_FAILURE(status)) {
             errln("ICU Error %s while parsing test file at line %d.",
                 u_errorName(status), lineNum);
-            goto end_test;
             status = U_ZERO_ERROR;
+            goto end_test; // Stop the test
         }
 
     }