Conflicts in schools over race, fees or language frequently make headlines in South Africa. Such conflicts reflect the multifaceted issue of learner diversity, encompassing racial, class, gender, religious, linguistic, physical and other differences. The need to handle such differences in equitable ways poses new challenges for teachers and teacher education. How are teacher education institutions preparing students for teaching in schools that are different from the ones they experienced as learners? What kinds of skills are they providing to enable teachers to deal with diversity and difference amongst learners.