This chapter focuses on key issues in teacher education for diversity: the system and its governance, strengthening the research base, and improving teaching practice. Gaps in our knowledge and areas for improvement are identified and discussed for each of these areas. Orientations for addressing and improving the current state of affairs are also provided. These orientations are necessarily general as approaches to diversity in teacher education are context-dependent; therefore, it is argued that they should be used as a starting point for further thematic and contextual analysis. Policy makers, educators and research communities are encouraged to consolidate their efforts and resources to provide sound evidence for future decision.making on this important and sensitive topic.