This chapter addresses the complexity of diversity as a concept in and for education and highlights the importance of awareness and consideration of this complexity for policy development and classroom practice. Diversity encompasses a range of interpretations, definitions and understandings within and beyond the Aotearoa New Zealand education context. This chapter looks at different ways in which diversity is understood and used in social and educational policies, and relations to different aspects of the education system will be considered. Some of the implicit and explicit challenges and opportunities for education and the education system will be outlined, and possible implications for policy development and teaching practice in Aotearoa that could arise from these diverging viewpoints will be discussed.