Crop and tree diversification can help smallholders manage climate risk by reducing the overall risk to their production. At the farm level, diversification provides risk management and microclimate improvement. At the landscape level, it reduces pest and disease pressures and regulates local climates. Developing diversification strategies with local stakeholders and relevant parties is a priority action area. Institutional support is also needed to incentivize diversification and ensure its long-term success. Research should explore optimal landscape structures and how diversification at this scale impacts pest control and climate regulation.