If the Paris Agreement’s 2°C goal is to be achieved, unprecedented efforts across all areas of socioeconomic activity are needed. National climate policy measures with direct or indirect trade implications stand the risk of colliding with the rules and requirements put forward by international trade agreements. Leaving the fate of climate measures to the WTO dispute settlement system is associated with risks and uncertainty, and could lead to a chilling effect on investment in climate mitigation and adaptation. This Article identifies a set of options for improved alignment of the trade and climate regimes, and offers recommendations for policy reform.