diff --git a/htlcswitch/test_utils.go b/htlcswitch/test_utils.go
index 6eb61e7a5..e544a0f65 100644
--- a/htlcswitch/test_utils.go
+++ b/htlcswitch/test_utils.go
@@ -358,8 +358,10 @@ func getChanID(msg lnwire.Message) (lnwire.ChannelID, error) {
 		chanID = msg.ChanID
 	case *lnwire.ChannelReestablish:
 		chanID = msg.ChanID
+	case *lnwire.FundingLocked:
+		chanID = msg.ChanID
 	default:
-		return chanID, errors.New("unknown type")
+		return chanID, fmt.Errorf("unknown type: %T", msg)
 	}
 
 	return chanID, nil