Over the past few decades, diversity and multiculturalism have received considerable attention in the field of psychology. While there have been notable efforts to ensure these important areas are addressed in undergraduate psychology training, little is known about this undertaking. The present study examined how diversity and multiculturalism were addressed in the course titles and course descriptions of 200 undergraduate, psychology programs across North America and their corresponding general education programs. Analyses revealed that while most undergraduate psychology programs offered diversity or multicultural courses, very few programs required these courses. Moreover, when these courses were offered, they typically examined diversity or multiculturalism in a singular fashion, giving very little attention to the intersectionality that exists among cultural factors. With respect to the institutions' general education programs, we found that while some institutions had a multicultural awareness requirement, few offered or required psychology-based diversity or multicultural courses of their psychology students. Implications of these finding are considered, and several recommendations and resources for improving undergraduate psychology programs are provided.