Coming into the French Open, Norrie said he had been playing some of his best tennis, describing his level as similar to when he was a top-10 player back in 2022.
It raised eyebrows – but he proved to be right.
A memorable five-set win over former world number one Medvedev set the tone, followed by victories against Argentine qualifier Federico Gomez and fellow Scot Jacob Fearnley, who replaced him as British number two earlier this year.
Facing Djokovic was a different proposition.
Norrie had lost all five of his previous meetings with the three-time French Open champion, including a three-set defeat in the Geneva Open 10 days ago.
He was quickly outmanoeuvred in the first set and, after Djokovic needed medical treatment on foot blisters, the British number three could not maintain an early break in the second.
Crucially, Norrie could not convert more chances, with Djokovic saving break points in lengthy service games at 2-2 and 3-3.
The former world number one then raced away with the final set, breaking early and reeling off five games in a row before serving out victory.
Despite not being able to end his miserable run against Djokovic, Norrie will take a great deal of satisfaction from the clay-court swing.
Earlier this year he had been in danger of tumbling out of the world’s top 100 after a difficult couple of years struggling for form and fitness.
But a reinvigorated Norrie will now move back into the top 60 when he starts the grass-court season back in the UK.