Scotland will take on 2022 World Cup hosts Qatar at Easter Road in a warm-up ahead of the Euro qualifier with the Republic of Ireland in Dublin on June 13.
Manager Gordon Strachan got his wish of a game ahead of the clash with Martin O'Neill's side as many of his players' club seasons will have finished several weeks previously.
He said: "We won't know the full picture in terms of our squad's individual circumstances until May but we'll ensure those whose seasons finish early will have a fitness programme to work on over the break.
"The match against Qatar will give us a competitive game before playing the Republic of Ireland."
Scotland have suffered a blow after UEFA awarded Russia a 3-0 win over Montenegro following the abandonment of their Group G qualifier in Podgorica due to crowd trouble.
Strachan's men had been the best third-placed team, which means automatic qualification for France, but Russia now hold that spot.
Meanwhile, Scotland are back into the top 30 sides in the FIFA world rankings following wins over Northern Ireland and Gibraltar. Strachan's men are 29th, rising 10 places from their previous position.
