diff --git a/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h b/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h
index 2b3e2d0ff96800..03f6b70aae719b 100644
--- a/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h
+++ b/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h
@@ -168,7 +168,9 @@ class TestCommandBridge : public CHIPCommandBridge,
         }
 
         mConnectedDevices[identity] = [MTRBaseDevice deviceWithNodeID:@(value.nodeId) controller:controller];
-        NextTest();
+        dispatch_async(mCallbackQueue, ^{
+            NextTest();
+        });
         return CHIP_NO_ERROR;
     }
 
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerOverXPC.m b/src/darwin/Framework/CHIP/MTRDeviceControllerOverXPC.m
index efb6d2615ed242..52cfb2244caba1 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerOverXPC.m
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerOverXPC.m
@@ -123,10 +123,7 @@ - (void)fetchControllerIdWithQueue:(dispatch_queue_t)queue completion:(MTRFetchC
 
 - (MTRBaseDevice *)baseDeviceForNodeID:(NSNumber *)nodeID
 {
-    return [[MTRDeviceOverXPC alloc] initWithControllerID:self.controllerID
-                                               controller:self
-                                                 deviceID:nodeID
-                                            xpcConnection:self.xpcConnection];
+    return [[MTRDeviceOverXPC alloc] initWithControllerOverXPC:self deviceID:nodeID xpcConnection:self.xpcConnection];
 }
 
 - (instancetype)initWithControllerID:(id)controllerID
diff --git a/src/darwin/Framework/CHIP/MTRDeviceOverXPC.h b/src/darwin/Framework/CHIP/MTRDeviceOverXPC.h
index 13974691cf8d4a..9718c3ee34a3f7 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceOverXPC.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceOverXPC.h
@@ -28,10 +28,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 
-- (instancetype)initWithControllerID:(id<NSCopying> _Nullable)controllerID
-                          controller:(MTRDeviceControllerOverXPC *)controller
-                            deviceID:(NSNumber *)deviceID
-                       xpcConnection:(MTRDeviceControllerXPCConnection *)xpcConnection;
+- (instancetype)initWithControllerOverXPC:(MTRDeviceControllerOverXPC *)controllerOverXPC
+                                 deviceID:(NSNumber *)deviceID
+                            xpcConnection:(MTRDeviceControllerXPCConnection *)xpcConnection;
 
 @end
 
diff --git a/src/darwin/Framework/CHIP/MTRDeviceOverXPC.m b/src/darwin/Framework/CHIP/MTRDeviceOverXPC.m
index 56993b70bdf57e..b34c78ed747654 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceOverXPC.m
+++ b/src/darwin/Framework/CHIP/MTRDeviceOverXPC.m
@@ -38,13 +38,12 @@ @interface MTRDeviceOverXPC ()
 
 @implementation MTRDeviceOverXPC
 
-- (instancetype)initWithControllerID:(id<NSCopying> _Nullable)controllerID
-                          controller:(MTRDeviceControllerOverXPC *)controller
-                            deviceID:(NSNumber *)deviceID
-                       xpcConnection:(MTRDeviceControllerXPCConnection *)xpcConnection
+- (instancetype)initWithControllerOverXPC:(MTRDeviceControllerOverXPC *)controllerOverXPC
+                                 deviceID:(NSNumber *)deviceID
+                            xpcConnection:(MTRDeviceControllerXPCConnection *)xpcConnection
 {
-    _controllerID = controllerID;
-    _controller = controller;
+    _controllerID = controllerOverXPC.controllerID;
+    _controller = controllerOverXPC;
     _nodeID = deviceID;
     _xpcConnection = xpcConnection;
     return self;
diff --git a/src/darwin/Framework/CHIPTests/MTRXPCListenerSampleTests.m b/src/darwin/Framework/CHIPTests/MTRXPCListenerSampleTests.m
index 1e3f1a4aa5282a..92ff0ec9133dfd 100644
--- a/src/darwin/Framework/CHIPTests/MTRXPCListenerSampleTests.m
+++ b/src/darwin/Framework/CHIPTests/MTRXPCListenerSampleTests.m
@@ -519,6 +519,7 @@ - (void)waitForCommissionee
                    NSLog(@"Listener is not active");
                    return nil;
                }];
+    mConnectedDevice = [MTRBaseDevice deviceWithNodeID:@(kDeviceId) controller:remoteController];
     mDeviceController = remoteController;
 }