diff --git a/testutil/agent.go b/testutil/agent.go
index 8329a106c..b2c2efd4f 100644
--- a/testutil/agent.go
+++ b/testutil/agent.go
@@ -497,6 +497,12 @@ func (client *SsntpTestClient) EventNotify(event ssntp.Event, frame *ssntp.Frame
 	var result Result
 
 	switch event {
+	case ssntp.NodeConnected:
+		//handled by ConnectNotify()
+		return
+	case ssntp.NodeDisconnected:
+		//handled by DisconnectNotify()
+		return
 	case ssntp.TenantAdded:
 		var tenantAddedEvent payloads.EventTenantAdded
 
diff --git a/testutil/controller.go b/testutil/controller.go
index 9ab909e51..3a544c12f 100644
--- a/testutil/controller.go
+++ b/testutil/controller.go
@@ -287,10 +287,14 @@ func (ctl *SsntpTestController) EventNotify(event ssntp.Event, frame *ssntp.Fram
 	var result Result
 
 	switch event {
-	// case ssntp.NodeConnected:	handled by ConnectNotify()
-	// case ssntp.NodeDisconnected:	handled by DisconnectNotify()
 	// case ssntp.TenantAdded: does not reach controller
 	// case ssntp.TenantRemoved: does not reach controller
+	case ssntp.NodeConnected:
+		//handled by ConnectNotify()
+		return
+	case ssntp.NodeDisconnected:
+		//handled by DisconnectNotify()
+		return
 	case ssntp.PublicIPAssigned:
 		var publicIPAssignedEvent payloads.EventPublicIPAssigned