The integration debate in Germany is closely connected to the education debate. Both are related to recent societal changes. Discussions at the social and political level in the past couple of years have shown how highly emotionally charged attitudes towards migration and integration in this country truly are. This article aims to provide an overview of intercultural developments in German educational contexts, especially those related to primary schools, against the background of societal change. We trace the developments in Germany from foreigner pedagogy and intercultural pedagogy to a pedagogy incorporating antiracism elements and subsequently a pedagogical approach focused on diversity (diversity pedagogy). We conclude that though many gains have been made, there is presently a danger that we will lose sight of cultural heterogeneity as diversity pedagogy in Germany has expanded to incorporate social inclusion.