Martina Hingis has mentored teenager Belinda Bencic throughout her pro career.
The 35-year-old Hingis and 19-year-old Bencic joined forces to win the decisive doubles and clinch Switzerland's 3-2 victory over host Germany in the Fed Cup quarterfinals in February.
More: Sharapova's Attorney Blasts WADA President
The pair will reunite in Rio to play for the Olympic gold medal in doubles.
The world No. 8 confirmed she will partner doubles No. 1 Hingis in the Rio doubles draw saying "now it's set."
Hingis will also play mixed doubles with former Hopman Cup partner Roger Federer, while Bencic could play mixed doubles with two-time Grand Slam champion Stan Wawrinka if Wawrinka opts to play with her rather than Timea Bacsinszky.
"Mixed is just Martina and Roger is set. Stan, I mean, he didn't decide yet," Bencic told the media in Eastbourne. "I mean, Olympics, I heard so many great things from other players that it's so different and so much exciting. Obviously I'm looking forward to it.
"I don't know (about mixed doubles). It's also chance (Stan) will play with Timea. I don't know."
Photo credit: Fed Cup Facebook