The Vodafone Fiji 7s team were made to work hard in their second pool match in the Dubai 7s tournament.
Fiji came from the death to beat Japan 21-17 on Day One of the competition to remain unbeaten in pool stages.
Ben Ryan coached side were brought down to earth as Japan nearly pulled off an upset win.
Fiji led 14 – nil with tries to Jerry Tuwai and Vatemo Ravouvou.
Japan then hit back with three three tries to lead 17 – 14.
Savenaca Rawaca was the saviour for Fiji scoring in the dying minutes to deny Japan a victory.
Fiji will now face Australia in the Cup quarterfinal at 8pm today.
Fiji earlier beat Canada 63-14 and Argentina 28 – nil in pool stages.
Cup Quarterfinal Draws:
8pm – Fiji v Australia
8:22pm – New Zealand v Samoa
8:44pm – England v Argentina
9:06pm – South Africa v USA