The majority of literature on mentoring focuses on mentee training needs, with significantly less guidance for the mentors. Moreover, many mentoring the mentor models assume generic (i.e. White) mentees with little attention to the concerns of underrepresented racial/ethnic minorities (UREM). This has led to calls for increased attention to diversity in research training programs, especially in the field of HIV where racial/ethnic disparities are striking. Diversity training tends to address the mentees’ cultural competency in conducting research with diverse populations, and often neglects the training needs of mentors in working with diverse mentees. In this article, we critique the framing of diversity as the problem (rather than the lack of mentor consciousness and skills), highlight the need to extend mentor training beyond aspirations of cultural competency toward cultural humility and cultural safety, and consider challenges to effective mentoring of UREM, both for White and UREM mentors.