Non-binary speakers often struggle to describe themselves within the binary gender system of Spanish. This is even more of a challenge for learners of Spanish who are used to describing themselves in English without having to identify their gender. Our study investigates how we can create a more inclusive learning experience in our Spanish language classrooms. To answer our research question, we conducted a needs analysis through the distribution of an online survey and a series of 20-minute interviews with students and instructors of Spanish in Western Canada. Through these methods, we determined what participants already know about gender-neutral and inclusive language, and what they want or need to know to be able to use and teach inclusive language. Participants were also given the opportunity to share their suggestions and ideas as to how to create a more inclusive learning environment. The key findings indicated that both instructors and students need education and training, and access to teaching and learning resources to normalize the use of gender-inclusive language in the Spanish classroom, which in return will help foster a learning space that is inclusive of all students.