Cultural diversity is evident throughout schools in Victoria, Australia. Many students are new arrivals from war-torn countries including Sudan, Afghanistan and Iraq. To what extent do teacher training courses in Victoria prepare pre-service teachers to cater for the needs of culturally and linguistically diverse (CALD) students? This paper reports findings from a qualitative study on pre-service preparation for teaching CALD students in mainstream secondary schools. It investigated ways in which CALD student needs are addressed in secondary teaching courses in Victoria. Data included course outlines, questionnaires completed by forty-one final year pre-service teachers, and interviews with four final year pre-service teachers. Findings revealed that the majority of pre-service secondary teachers feel that their teacher education courses lack a focus on cultural and linguistic diversity in schools. Course content analysis supports this. Courses need to be updated to address the needs of teachers of CALD students, and consequently of the students themselves. This paper provides practical ways to begin this process.