World No. 8 Kei Nishikori will open against defending champion Novak Djokovic at the ATP World Tour Finals on Sunday after the draw was made for the upcoming London event on Thursday.

Nishikori made the finals for the second year running and will face World No.1 Serb, the winner of the last four Finals and the player who knocked him out last year in the semifinals 6-1, 3-6, 6-0.

The draw pits World No. 3 Roger Federer and No. 6 Tomas Berdych alongside Djokovic and Nishikori in Group A, with the Japanese looking to make a quick recovery from light inflammation to his left side that forced him to withdraw from the Paris Masters in the third round on Nov. 5.

Andy Murray, Stan Wawrinka, Rafael Nadal and David Ferrer make up Group B, with the top two players from each group after three round-robin matches advancing to the semifinals.