diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java
index f0bb070d013..d5340516cce 100644
--- a/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java
+++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java
@@ -324,8 +324,7 @@ public void authorityIsReadable_default() {
 
     builder = new ManagedChannelImplBuilder(DUMMY_AUTHORITY_VALID,
         mockClientTransportFactoryBuilder, new FixedPortProvider(DUMMY_PORT));
-    ManagedChannel channel = builder.build();
-    grpcCleanupRule.register(channel);
+    ManagedChannel channel = grpcCleanupRule.register(builder.build());
     assertEquals(DUMMY_AUTHORITY_VALID, channel.authority());
   }
 
@@ -338,9 +337,9 @@ public void authorityIsReadable_overrideAuthority() {
         .thenReturn(mockClientTransportFactory);
 
     builder = new ManagedChannelImplBuilder(DUMMY_TARGET,
-        mockClientTransportFactoryBuilder, new FixedPortProvider(DUMMY_PORT));
-    ManagedChannel channel = builder.overrideAuthority(overrideAuthority).build();
-    grpcCleanupRule.register(channel);
+        mockClientTransportFactoryBuilder, new FixedPortProvider(DUMMY_PORT))
+        .overrideAuthority(overrideAuthority);
+    ManagedChannel channel = grpcCleanupRule.register(builder.build());
     assertEquals(overrideAuthority, channel.authority());
   }