In increasingly complex and heterogeneous societies, dealing with diversity is becoming one of the central issues for the future. A model for diversity-friendly school and (physical education) teaching development is proposed, aiming to promote acceptance of diversity and the ability to deal with diversity among students. Based on this model, an in-school continuing education program was designed and evaluated. The implementation of diversity-friendly physical education correlates with Education for Acceptance and Tolerance of Diversity (EATD) among students (attitudes and perceived social acceptance within the class).