New Lions coach Ian McGeechan will return to familiar territory this summer after it was confirmed Edinburgh will host Wasps in a pre-season friendly at Murrayfield on August 23.
McGeechan enjoyed two spells in charge of the Scotland national side, notably steering them to Grand Slam glory in 1990 with a famous victory over England at the Edinburgh stadium.
Edinburgh will also face coach Andy Robinson's former club Bath in another high-profile friendly - at the Recreation Ground the following Friday.
Robinson said: “We want to start with a bang next season, so playing against two great sides like Wasps and Bath will enable us to test exactly how our pre-season preparation work is going.”
Wasps director of rugby McGeechan has been confirmed as head coach of the British and Irish Lions for the tour to South Africa next summer.
And Robinson, who was assistant coach on the 2005 tour to New Zealand, believes the former Northampton coach is the perfect choice.
He added: “He is part of the Lions history and he is a very good coach; he is the obvious choice for the trip. “I have worked with him on Lions tours, both as a player and as a coach.”