Germany is currently changing its self-perception as it shifts from a culturally homogenous nation to a more pluralistic society shaped by immigration. Education is thus evolving to be more inclusive although heterogeneity is still considered a challenge with which to cope rather than a potential strength. This approach can be compared with countries that have longer histories of immigration, such as Canada, having moved from merely “dealing with heterogeneity” to embracing diversity as a resource for education. Teacher education plays a key role in this transition, and there are many approaches it can use to facilitate this shift. These approaches range from increasing the intake of teacher trainees with diverse backgrounds, to applying didactic approaches that will encourage communication about their different identities, to exploring basic philosophical concepts such as diversity, identity and controversy.