Rafael Nadal set up a French Open quarter-final against long-time rival Novak Djokovic with an absorbing five-set win over Felix Auger-Aliassime.

Spain’s Nadal, 35, dropped sets for the first time at this year’s event but recovered to win 3-6 6-3 6-2 3-6 6-3.

Top seed Djokovic produced his best level so far in the tournament to beat 15th seed Diego Schwartman 6-1 6-3 6-3.

Carlos Alcaraz and Alexander Zverev will also meet in the last eight after each claimed straight-set victories.