diff --git a/icu4c/source/common/utrace.c b/icu4c/source/common/utrace.c
index 04682a74bc4..679715a20ee 100644
--- a/icu4c/source/common/utrace.c
+++ b/icu4c/source/common/utrace.c
@@ -193,11 +193,6 @@ utrace_vformat(char *outBuf, int32_t capacity, int32_t indent, const char *fmt,
     int32_t   intArg;
     int64_t   longArg;
     char      *ptrArg;
-    int32_t   i;
-
-    for (i=0; i<indent; i++) {
-        outputChar(' ', outBuf, &outIx, capacity, indent);
-    }
 
     /*   Loop runs once for each character in the format string.
      */
diff --git a/icu4c/source/common/utracimp.h b/icu4c/source/common/utracimp.h
index 2a8cddec8d3..119d9df6194 100644
--- a/icu4c/source/common/utracimp.h
+++ b/icu4c/source/common/utracimp.h
@@ -111,11 +111,6 @@ utrace_level;
  * In C code, must be placed immediately after the last variable declaration.
  * Must be matched with UTRACE_EXIT() at all function exit points.
  *
- * Tracing should start with UTRACE_ENTRY after checking for
- * U_FAILURE at function entry, so that if a function returns immediately
- * because of a pre-existing error condition, it does not show up in the trace,
- * consistent with ICU's error handling model.
- *
  * @param fnNumber The UTraceFunctionNumber for the current function.
  * @internal
  */
diff --git a/icu4c/source/test/cintltst/cintltst.c b/icu4c/source/test/cintltst/cintltst.c
index 73c5a674d86..f452d75589a 100644
--- a/icu4c/source/test/cintltst/cintltst.c
+++ b/icu4c/source/test/cintltst/cintltst.c
@@ -66,6 +66,7 @@ static int traceFnNestingDepth = 0;
 void U_CALLCONV TraceEntry(const void *context, int32_t fnNumber) {
     char buf[500];
     utrace_format(buf, sizeof(buf), traceFnNestingDepth*3, "%s() enter.\n", utrace_functionName(fnNumber));
+    buf[sizeof(buf)-1]=0;  
     fputs(buf, stdout);
     traceFnNestingDepth++;
 }
@@ -77,8 +78,10 @@ void U_CALLCONV TraceExit(const void *context, int32_t fnNumber, const char *fmt
         traceFnNestingDepth--;
     }
     utrace_format(buf, sizeof(buf), traceFnNestingDepth*3, "%s() ", utrace_functionName(fnNumber));
+    buf[sizeof(buf)-1]=0;
     fputs(buf, stdout);
     utrace_vformat(buf, sizeof(buf), traceFnNestingDepth*3, fmt, args);
+    buf[sizeof(buf)-1]=0;
     fputs(buf, stdout);
     putc('\n', stdout);
 }
@@ -87,6 +90,7 @@ void U_CALLCONV TraceData(const void *context, int32_t fnNumber,
                           int32_t level, const char *fmt, va_list args) {
     char buf[500];
     utrace_vformat(buf, sizeof(buf), traceFnNestingDepth*3, fmt, args);
+    buf[sizeof(buf)-1]=0;
     fputs(buf, stdout);
     putc('\n', stdout);
 }