The hosts looked anything but Euro 2016 favourites as they struggled past a side ranked 42nd in the world, and were very nearly on the end of a major upset with Albania rattling a post.
But just as Albania looked set to register their first ever point at an international tournament, substitute Griezmann came to France’s rescue with less than a minute to go.
Then in stoppage time West Ham star Payet, back on his old Marseille stomping ground, curled in his second goal in two matches to secure their place in the knockout stages.