Defending champion Stefanos Tsitsipas was placed in the same round-robin group as Rafael Nadal when the draw for the ATP Finals was made in London on Thursday.
The Greek will also face Austria's US Open champion Dominic Thiem, who he beat in last year's final, and Russian debutant Andrey Rublev in the London group.
World number one Novak Djokovic, bidding for a record-equalling sixth title at the event, is in the Tokyo group with Russian Daniil Medvedev, Germany's Alexander Zverev and Argentine first-time Diego Schwartzman.
The ATP's elite year-ender, celebrating its 50th edition, is being staged at London's O2 Arena for the final time having moved there in 2009. Next year it will move to Turin.
The draw was broadcast on BBC Radio Five Live and included American great Stan Smith who beat Rod Laver to win the first edition in Tokyo in 1970.
Usually a hugely-popular week for tennis fans, this year's tournament will be staged without fans due to the surging COVID-19 pandemic which has forced another lockdown in London.