Shaun Edwards was appointed Wales defence coach in 2008
Shaun Edwards missed Wales' final 2011 Six Nations trip to France after the defence coach was suspended by his employers the Welsh Rugby Union.
Edwards was suspended for a week following an alleged incident with another member of Wales' backroom team.
The 44-year-old is reported to have had a confrontation with WRU performance analyst Fergus Connolly at Wales' Vale of Glamorgan hotel base on 12 March.
Wales coach Warren Gatland said "This is an internal matter, full stop."
The alleged confrontation happened the night of Wales' 19-13 win over Ireland at the Millennium Stadium.
Both men were suspended for a week and were not in Paris for Wales' 28-9 defeat to France on Saturday.
A Welsh Rugby Union source confirmed to Press Association Sport that Edwards, who is also head coach of English Premiership side London Wasps, would be back with the Wales squad ahead of their next game against the Barbarians in Cardiff on 4 June.
Edwards, who joined Gatland's backroom team ahead of Wales' 2008 Grand Slam winning campaign, has a contract with the WRU that expires after this autumn's World Cup in New Zealand.