diff --git a/src/darwin/Framework/CHIPTests/MTRClustersTests.m b/src/darwin/Framework/CHIPTests/MTRClustersTests.m
index 8e2931f354f33f..a2f399707e87ff 100644
--- a/src/darwin/Framework/CHIPTests/MTRClustersTests.m
+++ b/src/darwin/Framework/CHIPTests/MTRClustersTests.m
@@ -181,7 +181,7 @@ - (void)testReuseChipClusterObject
     XCTestExpectation * expectation = [self expectationWithDescription:@"ReuseMTRClusterObjectFirstCall"];
 
     dispatch_queue_t queue = dispatch_get_main_queue();
-    MTRTestCluster * cluster = [[MTRTestCluster alloc] initWithDevice:device endpoint:1 queue:queue];
+    MTRBaseClusterTestCluster * cluster = [[MTRBaseClusterTestCluster alloc] initWithDevice:device endpoint:1 queue:queue];
     XCTAssertNotNil(cluster);
 
     [cluster testWithCompletionHandler:^(NSError * err) {
diff --git a/src/darwin/Framework/CHIPTests/MTRDeviceTests.m b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
index d8a21081de27ca..35f75a5ea73f9f 100644
--- a/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
+++ b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
@@ -823,15 +823,15 @@ - (void)test011_ReadCachedAttribute
     // Read cache
     NSLog(@"Reading from cache...");
     cacheExpectation = [self expectationWithDescription:@"Attribute cache read"];
-    [MTROnOff readAttributeOnOffWithAttributeCache:attributeCacheContainer
-                                          endpoint:@1
-                                             queue:queue
-                                 completionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-                                     NSLog(@"Read attribute cache value: %@, error: %@", value, err);
-                                     XCTAssertEqual([MTRErrorTestUtils errorToZCLErrorCode:err], 0);
-                                     XCTAssertTrue([value isEqualToNumber:[NSNumber numberWithBool:NO]]);
-                                     [cacheExpectation fulfill];
-                                 }];
+    [MTRBaseClusterOnOff readAttributeOnOffWithAttributeCache:attributeCacheContainer
+                                                     endpoint:@1
+                                                        queue:queue
+                                            completionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+                                                NSLog(@"Read attribute cache value: %@, error: %@", value, err);
+                                                XCTAssertEqual([MTRErrorTestUtils errorToZCLErrorCode:err], 0);
+                                                XCTAssertTrue([value isEqualToNumber:[NSNumber numberWithBool:NO]]);
+                                                [cacheExpectation fulfill];
+                                            }];
     [self waitForExpectations:[NSArray arrayWithObject:cacheExpectation] timeout:kTimeoutInSeconds];
 
     // Read from cache using generic path