Narita International Airport, located about 40 miles (64 kilometers) outside of Tokyo, has always been something of a headache for travelers.

A lack of off-hour transport options means passengers and staff on early and late flights can sometimes be left stranded. But that's about to change, with train and bus operators set to expand their schedules in order to accommodate later night flights, the airport operator said.

With the 2020 Tokyo Olympics around the corner and the government moving ahead with plans to authorize the building of integrated resorts that allow gambling, Japan is on track to hit its goal of attracting 40 million annual tourists.

Flight routes over Tokyo are also being expanded so more planes can land at Haneda, the city's other major airport that was reopened for international flights about a decade ago.

With international travelers preferring to fly in and out of Haneda, which is much closer to Tokyo, Narita Airport is under pressure to boost convenience.

"With a change in late-night flight regulations and routes, and the accompanying increase in customers, we have been working with various parties to expand restaurant and retail options at the airport, while also securing ways for people to access the airport late at night," the Narita International Airport Corp. said in a statement.

East Japan Railway Co. and Keisei Electric Railway Co. plan to operate three extra trains until 10 minutes after midnight. Keisei's bus company will also offer two more buses until 30 minutes after midnight, taking travelers to Tokyo. Many of those will connect with late trains still running in the capital.

Miss them, though, and you're stuck — unless you're willing to spend ¥28,000 ($263) on a taxi into Tokyo.