Top seed Novak Djokovic reached the French Open quarter-finals for a record-extending 11th successive year by easing through his biggest test yet in Russian 15th seed Karen Khachanov.
The 33-year-old Serb was pushed throughout by Khachanov, but had too much quality in a 6-4 6-3 6-3 win.
Djokovic will face Pablo Carreno Busta or Daniel Altmaier in the last eight.
Greek fifth seed Stefanos Tsitsipas reached his first quarter-final with victory over Bulgarian Grigor Dimitrov.
Tsitsipas will play 13th seed Andrey Rublev after the Russian's 6-7 (4-7) 7-5 6-4 7-6 (7-3) win over Marton Fucsovics.