diff --git a/src/objective-c/tests/CronetTests/CronetUnitTests.mm b/src/objective-c/tests/CronetTests/CronetUnitTests.mm
index b17bc334479..b0f3a3000f1 100644
--- a/src/objective-c/tests/CronetTests/CronetUnitTests.mm
+++ b/src/objective-c/tests/CronetTests/CronetUnitTests.mm
@@ -40,8 +40,8 @@
 #import "test/core/util/test_config.h"
 
 #define GRPC_SHADOW_BORINGSSL_SYMBOLS
-#import "src/core/tsi/grpc_shadow_boringssl.h"
 #import <openssl_grpc/ssl.h>"
+#import "src/core/tsi/grpc_shadow_boringssl.h"
 
 static void drain_cq(grpc_completion_queue *cq) {
   grpc_event ev;
diff --git a/src/objective-c/tests/EnableCronet.m b/src/objective-c/tests/EnableCronet.m
index b618ec74706..5e0c933d835 100644
--- a/src/objective-c/tests/EnableCronet.m
+++ b/src/objective-c/tests/EnableCronet.m
@@ -18,8 +18,8 @@
 
 #ifdef GRPC_COMPILE_WITH_CRONET
 
-#import <Cronet/Cronet.h>
 #import "EnableCronet.h"
+#import <Cronet/Cronet.h>
 
 void enableCronet(void) {
   static dispatch_once_t enableCronet;
diff --git a/src/objective-c/tests/InteropTests/InteropTests.m b/src/objective-c/tests/InteropTests/InteropTests.m
index 91fdd0fd841..89f5b96c38b 100644
--- a/src/objective-c/tests/InteropTests/InteropTests.m
+++ b/src/objective-c/tests/InteropTests/InteropTests.m
@@ -36,8 +36,8 @@
 #import <grpc/grpc.h>
 #import <grpc/support/log.h>
 
-#import "InteropTestsBlockCallbacks.h"
 #import "../EnableCronet.h"
+#import "InteropTestsBlockCallbacks.h"
 
 #define TEST_TIMEOUT 32
 
diff --git a/src/objective-c/tests/InteropTests/InteropTestsMultipleChannels.m b/src/objective-c/tests/InteropTests/InteropTestsMultipleChannels.m
index 58946825f98..ffda48719e7 100644
--- a/src/objective-c/tests/InteropTests/InteropTestsMultipleChannels.m
+++ b/src/objective-c/tests/InteropTests/InteropTestsMultipleChannels.m
@@ -26,8 +26,8 @@
 #import <RemoteTest/Test.pbrpc.h>
 #import <RxLibrary/GRXBufferedPipe.h>
 
-#import "InteropTestsBlockCallbacks.h"
 #import "../EnableCronet.h"
+#import "InteropTestsBlockCallbacks.h"
 
 #define NSStringize_helper(x) #x
 #define NSStringize(x) @NSStringize_helper(x)
@@ -67,8 +67,6 @@ static const NSTimeInterval TEST_TIMEOUT = 8000;
 }
 @end
 
-
-
 @interface InteropTestsMultipleChannels : XCTestCase
 
 @end
@@ -97,7 +95,6 @@ dispatch_once_t initCronet;
   // Cronet stack with remote host
   _remoteCronetService = [RMTTestService serviceWithHost:kRemoteSSLHost callOptions:options];
 
-
   // Local stack with no SSL
   options = [[GRPCMutableCallOptions alloc] init];
   options.transportType = GRPCTransportTypeInsecure;
@@ -134,42 +131,54 @@ dispatch_once_t initCronet;
     XCTAssertEqualObjects(message, expectedResponse);
   };
 
-  GRPCUnaryProtoCall *callRemote = [_remoteService emptyCallWithMessage:request
-                       responseHandler:[[InteropTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
-                                                                                           messageCallback:messageHandler
-                                                                                             closeCallback:^(NSDictionary *trailingMetadata, NSError *error) {
-                                                                                               XCTAssertNil(error);
-                                                                                               [expectRemote fulfill];
-                                                                                             }
-                                                                                      writeMessageCallback:nil]
-                           callOptions:nil];
-  GRPCUnaryProtoCall *callCronet = [_remoteCronetService emptyCallWithMessage:request
-                             responseHandler:[[InteropTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
-                                                                                                 messageCallback:messageHandler
-                                                                                                   closeCallback:^(NSDictionary *trailingMetadata, NSError *error) {
-                                                                                                     XCTAssertNil(error);
-                                                                                                     [expectCronetRemote fulfill];
-                                                                                                   }
-                                                                                            writeMessageCallback:nil]
-                                 callOptions:nil];
-  GRPCUnaryProtoCall *callCleartext = [_localCleartextService emptyCallWithMessage:request
-                               responseHandler:[[InteropTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
-                                                                                                   messageCallback:messageHandler
-                                                                                                     closeCallback:^(NSDictionary *trailingMetadata, NSError *error) {
-                                                                                                       XCTAssertNil(error);
-                                                                                                       [expectCleartext fulfill];
-                                                                                                     }
-                                                                                              writeMessageCallback:nil]
-                                   callOptions:nil];
-  GRPCUnaryProtoCall *callSSL = [_localSSLService emptyCallWithMessage:request
-                         responseHandler:[[InteropTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
-                                                                                             messageCallback:messageHandler
-                                                                                               closeCallback:^(NSDictionary *trailingMetadata, NSError *error) {
-                                                                                                 XCTAssertNil(error);
-                                                                                                 [expectSSL fulfill];
-                                                                                               }
-                                                                                        writeMessageCallback:nil]
-                             callOptions:nil];
+  GRPCUnaryProtoCall *callRemote = [_remoteService
+      emptyCallWithMessage:request
+           responseHandler:[[InteropTestsBlockCallbacks alloc]
+                               initWithInitialMetadataCallback:nil
+                                               messageCallback:messageHandler
+                                                 closeCallback:^(NSDictionary *trailingMetadata,
+                                                                 NSError *error) {
+                                                   XCTAssertNil(error);
+                                                   [expectRemote fulfill];
+                                                 }
+                                          writeMessageCallback:nil]
+               callOptions:nil];
+  GRPCUnaryProtoCall *callCronet = [_remoteCronetService
+      emptyCallWithMessage:request
+           responseHandler:[[InteropTestsBlockCallbacks alloc]
+                               initWithInitialMetadataCallback:nil
+                                               messageCallback:messageHandler
+                                                 closeCallback:^(NSDictionary *trailingMetadata,
+                                                                 NSError *error) {
+                                                   XCTAssertNil(error);
+                                                   [expectCronetRemote fulfill];
+                                                 }
+                                          writeMessageCallback:nil]
+               callOptions:nil];
+  GRPCUnaryProtoCall *callCleartext = [_localCleartextService
+      emptyCallWithMessage:request
+           responseHandler:[[InteropTestsBlockCallbacks alloc]
+                               initWithInitialMetadataCallback:nil
+                                               messageCallback:messageHandler
+                                                 closeCallback:^(NSDictionary *trailingMetadata,
+                                                                 NSError *error) {
+                                                   XCTAssertNil(error);
+                                                   [expectCleartext fulfill];
+                                                 }
+                                          writeMessageCallback:nil]
+               callOptions:nil];
+  GRPCUnaryProtoCall *callSSL = [_localSSLService
+      emptyCallWithMessage:request
+           responseHandler:[[InteropTestsBlockCallbacks alloc]
+                               initWithInitialMetadataCallback:nil
+                                               messageCallback:messageHandler
+                                                 closeCallback:^(NSDictionary *trailingMetadata,
+                                                                 NSError *error) {
+                                                   XCTAssertNil(error);
+                                                   [expectSSL fulfill];
+                                                 }
+                                          writeMessageCallback:nil]
+               callOptions:nil];
   [callRemote start];
   [callCronet start];
   [callCleartext start];
@@ -219,42 +228,58 @@ dispatch_once_t initCronet;
     }
   };
 
-  calls[0] = [_remoteService fullDuplexCallWithResponseHandler:[[InteropTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
-                                                                                                        messageCallback:^(id message) {
-                                                                                                          handler(0, message);
-                                                                                                        }
-                                                                                                          closeCallback:^(NSDictionary *trailingMetadata, NSError *error) {
-                                                                                                            XCTAssertNil(error);
-                                                                                                            [expectRemote fulfill];
-                                                                                                          } writeMessageCallback:nil]
-                                        callOptions:nil];
-  calls[1] = [_remoteCronetService fullDuplexCallWithResponseHandler:[[InteropTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
-                                                                                                                                             messageCallback:^(id message) {
-                                                                                                                                               handler(1, message);
-                                                                                                                                             }
-                                                                                                                                               closeCallback:^(NSDictionary *trailingMetadata, NSError *error) {
-                                                                                                                                                 XCTAssertNil(error);
-                                                                                                                                                 [expectCronetRemote fulfill];
-                                                                                                                                               } writeMessageCallback:nil]
-                                                                             callOptions:nil];
-  calls[2] = [_localCleartextService fullDuplexCallWithResponseHandler:[[InteropTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
-                                                                                                                                             messageCallback:^(id message) {
-                                                                                                                                               handler(2, message);
-                                                                                                                                             }
-                                                                                                                                               closeCallback:^(NSDictionary *trailingMetadata, NSError *error) {
-                                                                                                                                                 XCTAssertNil(error);
-                                                                                                                                                 [expectCleartext fulfill];
-                                                                                                                                               } writeMessageCallback:nil]
-                                                                             callOptions:nil];
-  calls[3] = [_localSSLService fullDuplexCallWithResponseHandler:[[InteropTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
-                                                                                                                                             messageCallback:^(id message) {
-                                                                                                                                               handler(3, message);
-                                                                                                                                             }
-                                                                                                                                               closeCallback:^(NSDictionary *trailingMetadata, NSError *error) {
-                                                                                                                                                 XCTAssertNil(error);
-                                                                                                                                                 [expectSSL fulfill];
-                                                                                                                                               } writeMessageCallback:nil]
-                                                                             callOptions:nil];
+  calls[0] = [_remoteService
+      fullDuplexCallWithResponseHandler:[[InteropTestsBlockCallbacks alloc]
+                                            initWithInitialMetadataCallback:nil
+                                            messageCallback:^(id message) {
+                                              handler(0, message);
+                                            }
+                                            closeCallback:^(NSDictionary *trailingMetadata,
+                                                            NSError *error) {
+                                              XCTAssertNil(error);
+                                              [expectRemote fulfill];
+                                            }
+                                            writeMessageCallback:nil]
+                            callOptions:nil];
+  calls[1] = [_remoteCronetService
+      fullDuplexCallWithResponseHandler:[[InteropTestsBlockCallbacks alloc]
+                                            initWithInitialMetadataCallback:nil
+                                            messageCallback:^(id message) {
+                                              handler(1, message);
+                                            }
+                                            closeCallback:^(NSDictionary *trailingMetadata,
+                                                            NSError *error) {
+                                              XCTAssertNil(error);
+                                              [expectCronetRemote fulfill];
+                                            }
+                                            writeMessageCallback:nil]
+                            callOptions:nil];
+  calls[2] = [_localCleartextService
+      fullDuplexCallWithResponseHandler:[[InteropTestsBlockCallbacks alloc]
+                                            initWithInitialMetadataCallback:nil
+                                            messageCallback:^(id message) {
+                                              handler(2, message);
+                                            }
+                                            closeCallback:^(NSDictionary *trailingMetadata,
+                                                            NSError *error) {
+                                              XCTAssertNil(error);
+                                              [expectCleartext fulfill];
+                                            }
+                                            writeMessageCallback:nil]
+                            callOptions:nil];
+  calls[3] = [_localSSLService
+      fullDuplexCallWithResponseHandler:[[InteropTestsBlockCallbacks alloc]
+                                            initWithInitialMetadataCallback:nil
+                                            messageCallback:^(id message) {
+                                              handler(3, message);
+                                            }
+                                            closeCallback:^(NSDictionary *trailingMetadata,
+                                                            NSError *error) {
+                                              XCTAssertNil(error);
+                                              [expectSSL fulfill];
+                                            }
+                                            writeMessageCallback:nil]
+                            callOptions:nil];
   for (int i = 0; i < 4; i++) {
     [calls[i] start];
     [calls[i] writeMessage:requests[0]];