The All Blacks play the Lions in the first test at Eden Park on June 24 and the Samoa match had long been discussed as a chance for Steve Hansen's side to work on their combinations before the series begins.
Wales's test against Tonga had been moved from Nuku'alofa after concerns over the state of the pitch at the National Stadium.
"It's great that we're going to play Samoa," Hansen said in a statement. "Along with Tonga and Wales it's going to be a wonderful evening where you've got Pasifika rugby on show and Welsh rugby and New Zealand rugby.
"It allows us to fill a need for ourselves as we need a game to prepare for the Lions and also give something back to Pasifika rugby."
New Zealand have typically been slow starters in their international seasons and Hansen had asked NZR to schedule a game in order to ensure they were not under prepared before they faced Warren Gatland's side.
The All Blacks used a similar tactic ahead of the 2005 Lions series when they played Fiji in Albany.
The Wales-Tonga game will kick off at 5:30 p.m. (0530 GMT) before the All Blacks play Samoa at 8 p.m.
The Lions play the Maori All Blacks in Rotorua on June 17.
(Reporting by Greg Stutchbury; Editing by Ken Ferris)
