diff --git a/icu4c/source/test/cintltst/cbiapts.c b/icu4c/source/test/cintltst/cbiapts.c
index 2b7f98d711..663d11e2de 100644
--- a/icu4c/source/test/cintltst/cbiapts.c
+++ b/icu4c/source/test/cintltst/cbiapts.c
@@ -43,11 +43,11 @@ static void TestBreakIteratorCAPI()
     int32_t i;
     int32_t count = 0;
 
-   	UBreakIterator * someIterators [CLONETEST_ITERATOR_COUNT];
-	UBreakIterator * someClonedIterators [CLONETEST_ITERATOR_COUNT];
-	UBreakIterator * brk;
-	uint8_t buffer [CLONETEST_ITERATOR_COUNT] [U_BRK_SAFECLONE_BUFFERSIZE];
-	int32_t bufferSize = U_BRK_SAFECLONE_BUFFERSIZE;
+    UBreakIterator * someIterators [CLONETEST_ITERATOR_COUNT];
+    UBreakIterator * someClonedIterators [CLONETEST_ITERATOR_COUNT];
+    UBreakIterator * brk;
+    uint8_t buffer [CLONETEST_ITERATOR_COUNT] [U_BRK_SAFECLONE_BUFFERSIZE];
+    int32_t bufferSize = U_BRK_SAFECLONE_BUFFERSIZE;
 
     u_uastrcpy(text, "He's from Africa. ""Mr. Livingston, I presume?"" Yeah");
     status  = U_ZERO_ERROR;
@@ -212,90 +212,90 @@ static void TestBreakIteratorCAPI()
 
     /*Testing ubrk_safeClone */
 
-	/* US & Thai - rule-based & dictionary based */
-	someIterators[0] = ubrk_open(UBRK_WORD, "en_US", text, u_strlen(text), &status);
-	someIterators[1] = ubrk_open(UBRK_WORD, "th_TH", text, u_strlen(text), &status);
-	
+    /* US & Thai - rule-based & dictionary based */
+    someIterators[0] = ubrk_open(UBRK_WORD, "en_US", text, u_strlen(text), &status);
+    someIterators[1] = ubrk_open(UBRK_WORD, "th_TH", text, u_strlen(text), &status);
+
     /* test each type of iterator */
     for (i = 0; i < CLONETEST_ITERATOR_COUNT; i++)
-	{
+    {
 
-	    /* Check the various error & informational states */
+        /* Check the various error & informational states */
 
-	    /* Null status - just returns NULL */
-	    if (0 != ubrk_safeClone(someIterators[i], buffer[i], &bufferSize, 0))
-	    {
-		    log_err("FAIL: Cloned Iterator failed to deal correctly with null status\n");
-	    }
-	    /* error status - should return 0 & keep error the same */
-	    status = U_MEMORY_ALLOCATION_ERROR;
-	    if (0 != ubrk_safeClone(someIterators[i], buffer[i], &bufferSize, &status) || status != U_MEMORY_ALLOCATION_ERROR)
-	    {
-		    log_err("FAIL: Cloned Iterator failed to deal correctly with incoming error status\n");
-	    }
-	    status = U_ZERO_ERROR;
+        /* Null status - just returns NULL */
+        if (0 != ubrk_safeClone(someIterators[i], buffer[i], &bufferSize, 0))
+        {
+            log_err("FAIL: Cloned Iterator failed to deal correctly with null status\n");
+        }
+        /* error status - should return 0 & keep error the same */
+        status = U_MEMORY_ALLOCATION_ERROR;
+        if (0 != ubrk_safeClone(someIterators[i], buffer[i], &bufferSize, &status) || status != U_MEMORY_ALLOCATION_ERROR)
+        {
+            log_err("FAIL: Cloned Iterator failed to deal correctly with incoming error status\n");
+        }
+        status = U_ZERO_ERROR;
 
-	    /* Null buffer size pointer - just returns NULL & set error to U_ILLEGAL_ARGUMENT_ERROR*/
-	    if (0 != ubrk_safeClone(someIterators[i], buffer[i], 0, &status) || status != U_ILLEGAL_ARGUMENT_ERROR)
-	    {
-		    log_err("FAIL: Cloned Iterator failed to deal correctly with null bufferSize pointer\n");
-	    }
-	    status = U_ZERO_ERROR;
-	
-	    /* buffer size pointer is 0 - fill in pbufferSize with a size */
-	    bufferSize = 0;
-	    if (0 != ubrk_safeClone(someIterators[i], buffer[i], &bufferSize, &status) || U_FAILURE(status) || bufferSize <= 0)
-	    {
-		    log_err("FAIL: Cloned Iterator failed a sizing request ('preflighting')\n");
-	    }
-	    /* Verify our define is large enough  */
-	    if (U_BRK_SAFECLONE_BUFFERSIZE < bufferSize)
-	    {
-		    log_err("FAIL: Pre-calculated buffer size is too small\n");
-	    }
-	    /* Verify we can use this run-time calculated size */
-	    if (0 == (brk = ubrk_safeClone(someIterators[i], buffer[i], &bufferSize, &status)) || U_FAILURE(status))
-	    {
-		    log_err("FAIL: Iterator can't be cloned with run-time size\n");
-	    }
-	    if (brk) ubrk_close(brk);
-	    /* size one byte too small - should allocate & let us know */
-	    --bufferSize;
-	    if (0 == (brk = ubrk_safeClone(someIterators[i], 0, &bufferSize, &status)) || status != U_SAFECLONE_ALLOCATED_ERROR)
-	    {
-		    log_err("FAIL: Cloned Iterator failed to deal correctly with too-small buffer size\n");
-	    }
-	    if (brk) ubrk_close(brk);
-	    status = U_ZERO_ERROR;
-	    bufferSize = U_BRK_SAFECLONE_BUFFERSIZE;
+        /* Null buffer size pointer - just returns NULL & set error to U_ILLEGAL_ARGUMENT_ERROR*/
+        if (0 != ubrk_safeClone(someIterators[i], buffer[i], 0, &status) || status != U_ILLEGAL_ARGUMENT_ERROR)
+        {
+            log_err("FAIL: Cloned Iterator failed to deal correctly with null bufferSize pointer\n");
+        }
+        status = U_ZERO_ERROR;
+    
+        /* buffer size pointer is 0 - fill in pbufferSize with a size */
+        bufferSize = 0;
+        if (0 != ubrk_safeClone(someIterators[i], buffer[i], &bufferSize, &status) || U_FAILURE(status) || bufferSize <= 0)
+        {
+            log_err("FAIL: Cloned Iterator failed a sizing request ('preflighting')\n");
+        }
+        /* Verify our define is large enough  */
+        if (U_BRK_SAFECLONE_BUFFERSIZE < bufferSize)
+        {
+            log_err("FAIL: Pre-calculated buffer size is too small\n");
+        }
+        /* Verify we can use this run-time calculated size */
+        if (0 == (brk = ubrk_safeClone(someIterators[i], buffer[i], &bufferSize, &status)) || U_FAILURE(status))
+        {
+            log_err("FAIL: Iterator can't be cloned with run-time size\n");
+        }
+        if (brk) ubrk_close(brk);
+        /* size one byte too small - should allocate & let us know */
+        --bufferSize;
+        if (0 == (brk = ubrk_safeClone(someIterators[i], 0, &bufferSize, &status)) || status != U_SAFECLONE_ALLOCATED_ERROR)
+        {
+            log_err("FAIL: Cloned Iterator failed to deal correctly with too-small buffer size\n");
+        }
+        if (brk) ubrk_close(brk);
+        status = U_ZERO_ERROR;
+        bufferSize = U_BRK_SAFECLONE_BUFFERSIZE;
 
-    	/* Null buffer pointer - return Iterator & set error to U_SAFECLONE_ALLOCATED_ERROR */
-	    if (0 == (brk = ubrk_safeClone(someIterators[i], 0, &bufferSize, &status)) || status != U_SAFECLONE_ALLOCATED_ERROR)
-	    {
-		    log_err("FAIL: Cloned Iterator failed to deal correctly with null buffer pointer\n");
-	    }
-	    if (brk) ubrk_close(brk);
-	    status = U_ZERO_ERROR;
+        /* Null buffer pointer - return Iterator & set error to U_SAFECLONE_ALLOCATED_ERROR */
+        if (0 == (brk = ubrk_safeClone(someIterators[i], 0, &bufferSize, &status)) || status != U_SAFECLONE_ALLOCATED_ERROR)
+        {
+            log_err("FAIL: Cloned Iterator failed to deal correctly with null buffer pointer\n");
+        }
+        if (brk) ubrk_close(brk);
+        status = U_ZERO_ERROR;
 
-	    /* Null Iterator - return NULL & set U_ILLEGAL_ARGUMENT_ERROR */
-	    if (0 != ubrk_safeClone(0, buffer[i], &bufferSize, &status) || status != U_ILLEGAL_ARGUMENT_ERROR)
-	    {
-		    log_err("FAIL: Cloned Iterator failed to deal correctly with null Iterator pointer\n");
-	    }
-	    status = U_ZERO_ERROR;
-	
-    	/* Do these cloned Iterators work at all - make a first & next call */
-		bufferSize = U_BRK_SAFECLONE_BUFFERSIZE;
-		someClonedIterators[i] = ubrk_safeClone(someIterators[i], buffer[i], &bufferSize, &status);
+        /* Null Iterator - return NULL & set U_ILLEGAL_ARGUMENT_ERROR */
+        if (0 != ubrk_safeClone(0, buffer[i], &bufferSize, &status) || status != U_ILLEGAL_ARGUMENT_ERROR)
+        {
+            log_err("FAIL: Cloned Iterator failed to deal correctly with null Iterator pointer\n");
+        }
+        status = U_ZERO_ERROR;
 
-	    start = ubrk_first(someClonedIterators[i]);
+        /* Do these cloned Iterators work at all - make a first & next call */
+        bufferSize = U_BRK_SAFECLONE_BUFFERSIZE;
+        someClonedIterators[i] = ubrk_safeClone(someIterators[i], buffer[i], &bufferSize, &status);
+
+        start = ubrk_first(someClonedIterators[i]);
         if(start!=0)
             log_err("error ubrk_start(clone) did not return 0\n");
         pos=ubrk_next(someClonedIterators[i]);
         if(pos!=4)
             log_err("error ubrk_next(clone) did not return 4\n");
-    		
-	    ubrk_close(someClonedIterators[i]);
-		ubrk_close(someIterators[i]);
-	}
+
+        ubrk_close(someClonedIterators[i]);
+        ubrk_close(someIterators[i]);
+    }
 }