Ian McGeechan is looking forward to his return to Murrayfield when he takes his Wasps side to the capital to play Edinburgh in a pre-season friendly.
Andy Robinson's side will face the newly-crowned Premiership champions in a warm-up game for the new season on August 23.
McGeechan, who won 32 caps for Scotland before taking charge successfully of the national team on two occasions, is relishing tackling Robinson's resurgent Edinburgh team.
He said: "We are delighted to be able to confirm we will be playing Edinburgh as part of our pre-season schedule for next season.
"My old friend Andy Robinson has done an outstanding job with the Edinburgh team, making them very competitive again.
"It's important to have some good challenging games as part of pre-season preparations and I have no doubt Edinburgh will provide us with that, so I'm looking forward to catching up with Andy and everyone at Edinburgh Rugby in August."
Conor O'Shea will lead his side to matches against Fiji and Australia
30 March 2017, 2:36pm
After a disappointing RBS 6 Nations campaign for the Azzurri - losing all five of their Championship matches and picking up their 12th Wooden Spoon - they will be licking their wounds ahead of their summer tour Down Under.
The 2017 RBS 6 Nations was watched by record numbers of fans
29 March 2017, 12:25pm
After an enthralling RBS 6 Nations Championship of twists, turns, and no small amount of drama on the last day, figures show the RBS 6 Nations is going from strength to strength, year on year, with no sign of slowing down.