China and Japan have agreed to set up talks on often contentious security issues. The two countries are seeking to improve a relationship riven in recent years by a range of issues, from territorial disputes to the discharge of water from Japan’s tsunami-wrecked nuclear power plant.

China and Japan agreed that Beijing’s top diplomat should visit in 2025, adding to the signs the two nations are repairing ties that have been strained in recent years.

Japanese Foreign Minister Takeshi Iwaya has met with top Chinese leaders during his visit to Beijing, the first since the heads of the two countries met at a summit in Peru last month.