This paper considers code-switching as a marker of register change in bilingual conversation, rather than as an isolated phenomenon, following Auer's (1984) framework, according to which code-switching tends to co-occur with other features that mark register shift. Evidence is found in the analysis of recorded natural conversation of two Finnish-English bilingual children.