More details have been released about security during the G7 meeting in Evian next month.
Border closures are likely to have a serious impact on traffic.
Around thirty smaller crossings will be shut between 12 and 18 June, with traffic funnelled through Anières, Moillesulaz, Thônex-Vallard, Bardonnex, Perly, Meyrin and Ferney-Voltaire.
Vehicle checks at those points will be more systematic, and significant delays are expected.
French activists are also planning protests in Geneva.
The head of Geneva's security, Carole-Anne Kast, says additional measures are needed to manage the spillover.
Heat to stay for now
Growing anger over World Cup red card
Fire damages trees in the Jardin Anglais
Cows sweltering in the heat
Lake Geneva nudists fight for their lake section
Holiday makers seek more than the sun
