Responding to a critical gap in diversity studies which have been mostly dedicated to Western contexts, and setting the scene for celebrating an ignored issue in the Iranian context are the aims of this study. To these ends, Tehran is selected, and its socio-spatial patterns of diversity are studied through a GIS-based analysis. Results suggest that housing and residential diversity are highly correlated. Influencing factors of diversity also indicate that diverse neighborhoods are usually smaller ones with higher population density. Surprisingly, land-use diversity does not have any significant relationship with housing and residential diversity in Tehran neighborhoods. Residential diversity usually occurs in neighborhoods, where jobs opportunities are more available, open spaces are more frequent, and individuals feel more secure. Recovering balances between residential and housing predictory variables and planning in the scale of neighborhoods rather than urban regions are what planners should seek through the notion of planning for diversity.