The Spanish educational model, which has teded historically to be singular with regard to religion, was redefined under the Constitution of 1978, incorporating values of pluralism, even in the realm of religion. The study of religions in the school is of outstanding educational interest in our globalized and multi-religious world. But in the Spanish case the development of Religious Education has been a controversial, provocative process marked by problems with the design and implementation of the subject, one key isuue being its development within a framework of segregated education. The contexts of the implementation of religious education (both in its confessional and non-confessional ways) in Spain are tackled in this article. The proposal that reflected religious diversity in a pedagogically correct mode, in non-segregated classrooms and from an integrative and non-confessional perspective, took form in the subject named «History and Culture of the Religions», which was taught between 2007 and 2014 in Spanish Schools.