Australia's Roland Garros challenge has been boosted by hugely encouraging wins in warm-up events for Alex de Minaur and Alexei Popyrin.
De Minaur, grittily, picked himself off the floor at the Hamburg Open, dusted off the clay caking his kit, got some medical attention and then battled to defeat Spaniard Alexander Davidovich Fokina 6-2 4-6 6-4 to move into the quarterfinals.
It was just the tonic the world No.9 needed after early exits in his previous two tournaments in Madrid and Rome, with the French major kicking off on Sunday.
Davidovich Fokina had his heart broken by De Minaur in last year's Washington final, losing after he held match points, but this time the world No.23 was the one threatening a comeback as he rallied from a set down.
> READ: De Minaur overcomes demons to win Washington crown
There was a scare at the start of the third set, when De Minaur took a nasty tumble into the dirt after being wrong-footed.
He needed to be patched up by the physio but bounced back emphatically. Then it was the Spaniard who seemed to suffer more in the brutally physical exchanges, as he needed a medical timeout for a sore serving shoulder.
The Australian No.1 raced to a 5-2 lead but endured a nervy finish as Davidovich Fokina fought back to 5-4 and saved two match points, before the Australian finally got the job done after two hours and 40 minutes.
Victory set up a last-eight tie against in-form Italian Open semi-finalist Luciano Darderi, who beat German Yannick Hanfmann 7-6(7) 7-5.
De Minaur is the first Australian man to reach the Hamburg quarterfinals since Lleyton Hewitt in 2007.
At the Geneva Open, Popyrin ensured Taylor Fritz's return after a two-month injury absence fell flat, playing a consummate match to knock out the American world No.8 and top seed 6-4 6-4 to book a quarterfinal place.
Fritz was rusty but world No.61 Popyrin, fresh from encouraging wins over Matteo Berrettini and Jakub Mensik in Rome, looked razor-sharp, hitting 25 winners.
"I am very happy," said the Australian, who will get more of a test in the quarters from Norway's two-time Roland Garros finalist Casper Ruud, who beat Belgian Raphael Collignon 7-6 (7-2) 6-2.
"I am glad to be playing this level finally this year. It has been a tough year for me, so playing this level a week before a slam is always a great feeling."
Watch the ATP and WTA tours LIVE & ON-DEMAND on beIN SPORTS.