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."
Wales' acting head coach Rob Howley has given Sam Davies and Rory Thornton a boost ahead of the RBS 6 Nations by naming the uncapped Ospreys duo in his largely experienced squad for the Autumn Internationals.