The first half had brought unwelcome memories of that campaign as Northern Ireland hogged the ball and kept their opponents on the back foot, only to go unrewarded.

The first clear sight of goal arrived inside two minutes when the ball fell for McGinn at the far post, but he cut across his shot to drag it wide.

Estonia's towering defenders Joonas Tamm and Madis Vihmann repelled a series of dangerous crosses, the bulk of them from the right where McGinn and Stuart Dallas made a nuisance of themselves, but Kyle Lafferty – making his first start since September – struggled to impact play in the middle.

The best chance fell to Paddy McNair, who buried his face in his hands after somehow heading Jordan Jones' looping cross down and over the bar from point-blank range in the 19th minute.

Craig Cathcart was the next to go close, getting his head to another Jones cross – this time from the right – but the Watford defender could not generate the power needed to beat Sergei Lepmets in the Estonia goal.

There was another fine chance with six minutes left in the half when Dallas' long throw was flicked on for Jones to strike on the turn, but his shot went just the wrong side of the post to keep it goalless at the break.

There were few signs of things changing in the opening 10 minutes of the second half as the hosts huffed and puffed without doing much to threaten Lepmets' goal.

But that changed in the 56th minute when Lafferty showed good strength to lay the ball off for McGinn to rifle home, to the audible relief of Windsor Park.

McNair went close again in the 64th minute, beating Lepmets to Lewis' cross, but he could not keep his header down.

But if McGinn's goal had eased some nerves among the fans there were two warning signs for Northern Ireland.

First a corner was flicked on to Mattias Kait at the far post but the Fulham man could not keep his shot down.

Then the flag stayed down as Henri Anier ran through at goal, but Bailey Peacock-Farrell was quickly off his line to charge down the shot.

Moments later, though, Northern Ireland had the points wrapped up. Estonia captain Karol Mets went in high on George Saville, and after the referee pointed to the spot, captain Davis sent his penalty straight down the middle.

There were late chances for Saville and substitute Josh Magennis to add a flourish, but Northern Ireland had already done enough to give them confidence they can make it six points out of six in Sunday's clash against Belarus.

ga('create', 'UA-72310761-1', 'auto', {'name': 'pacontentapi'});
ga('pacontentapi.set', 'referrer', location.origin);
ga('pacontentapi.set', 'dimension1', 'By Ian Parker, Press Association Sport');
ga('pacontentapi.set', 'dimension2', 'd1399589-c3cf-4a7d-b57c-e2b9b83de88a');
ga('pacontentapi.set', 'dimension3', 'paservice:sport,paservice:sport:football,paservice:sport:match-reports,paservice:sport:uk,paservice:sport:world');
ga('pacontentapi.set', 'dimension6', 'story');
ga('pacontentapi.set', 'dimension7', 'composite');
ga('pacontentapi.set', 'dimension8', null);
ga('pacontentapi.set', 'dimension9', 'sport:football');
ga('pacontentapi.send', 'pageview', { 'location': location.href, 'page': (location.pathname + location.search + location.hash), 'title': 'Northern Ireland up and running with qualifying win over Estonia'});