Rafael Nadal set up a French Open quarter-final against long-time rival Novak Djokovic after winning an absorbing five-set battle with Canada's Felix Auger-Aliassime in Paris.

Top seed Djokovic moved up a gear to beat 15th seed Diego Schwartzman.

The 35-year-old Serb produced his best level so far in the tournament to win 6-1 6-3 6-3 in his fourth-round match.

Fifth seed Nadal fixed up a 59th career meeting with Djokovic - a men's record - by beating ninth seed Auger-Aliassime later on Sunday.

Elsewhere, Alexander Zverev booked his place in the quarter-finals despite a patchy display against Spanish qualifier Bernabe Zapata Miralles as the third seed triumphed 7-6 (13-11) 7-5 6-3.

The 25-year-old German will next face the winner of Sunday's night session encounter between Spanish teenager Carlos Alcaraz and Karen Khachanov.

Djokovic uses crowd energy to beat Schwartzman

Two-time champion Djokovic came into the French Open having played fewer tournaments than usual this year but is showing signs of peaking at exactly the right time.

Schwartzman, a 2020 semi-finalist, was supposed to be Djokovic's toughest test so far.

But Djokovic saw off the diminutive Argentine in a professional display that was less comfortable than the scoreline suggested.

Djokovic was deported from Australia and not allowed to play at the year's opening Grand Slam event, then banned from entering the United States to play at Indian Wells and Miami, because he was not vaccinated against Covid-19.

After an early exit on his competitive return at Monte Carlo, he has continued to improve since and came into the clay-court Grand Slam on the back of winning the Italian Open in Rome.

In Paris he started with straight-set wins against Japan's Yoshihito Nishioka, Slovakia's Alex Molcan and Slovenia's Aljaz Bedene.

Despite his status as one the sport's all-time greats, Djokovic does not seem to enjoy the same amount of love at Roland Garros as Nadal or Switzerland's Roger Federer and a few boos were heard as walked on to court to face Schwartzman.

Schwartzman was backed by a noisy crowd on Court Suzanne Lenglen, the second show court in Paris, and thrived off the energy in the opening stages.

Djokovic had to defend well to hold in his first service game and then broke in the next before rattling off three more games for the opening set.

Support continued to be vociferously in favour of Schwartzman, leaving Djokovic ironically nodding his 'approval' as he trailed 3-0 at the start of the second set.

Momentum quickly shifted back and a trademark roar from Djokovic, who seemed to be using the crowd's support of Schwartzman as added motivation, marked the moment he levelled at 3-3.

Three more games capped a superb turnaround and, after a tight start to the third set, Djokovic broke for a 4-2 lead that enabled him to extend his 100% record over Schwartzman to a seventh match.

Zverev sees off qualifier Zapata Miralles

In contrast to Djokovic's dominant display, Zverev just about produced enough quality amid an often error-strewn performance to end the run of unseeded Spaniard Zapata Miralles.

The straight-set scoreline slightly flattered the German, who hit 63 unforced errors and eight double faults but came good on the majority of the match's big moments, hitting 34 winners to his opponent's 13.

Ultimately, his superb conversion rate of taking eight of nine break-point opportunities proved the difference, particularly in a marathon 62-minute first set that Zverev edged 13-11 on a tie-break.

World number 131 Zapata Miralles, who had won only one Grand Slam match before this tournament, twice edged ahead with service breaks in the second set but lost five of seven games from 4-2 up.

More to follow.