Tonga's entire transport industry will undergo a safety review by the World Bank.
The sector-wide review will include land, marine and aviation safety, and will be the basis of New Zealand's tourism development package, announced last year.
The review will also solve the dispute between the countries over the MA-60 aircraft, as its safety and certification will be included.
The Tongan Prime Minister, Lord Tu'ivakano, says two of Tonga's passenger boats have already been ruled unseaworthy, and his government is keen to implement international standards.
"Since we had that problem in the past with Ashika, I think we have learnt our lessons. And I think there's a continuous... make sure boats are seaworthy. But if the World Bank comes with any additions to what has been done, then we have to go through with what is the recommendation of the World Bank."