The Saracens lock was Johnson's leader for the first 20 Tests of his tenure before a knee injury forced him to miss the Six Nations finale against France.
Edinburgh were forced into two late changes, with Scott MacLeod replacing Jim Hamilton (knee) at lock, and John Houston coming onto the wing for Andrew Turnbull (illness).