Men and women will be able to compete as a pair at major diving events after world aquatics governing body approved the introduction of mixed-gender teams.
Mixed teams will compete in the 3m and 10m synchronised events.
Fina has also given the green light for mixed-gender duets in synchronised swimming.
Former world champion Tom Daley described the decision as "really exciting", adding: "I think the public will really get behind it."
British Diving's national performance director Alexei Evangulov also welcomed the news, saying: "The decision is a great opportunity to widen our sport, to increase popularity and to bring something new and fresh into the sport."