The 33-year-old Johnson will attend big league spring training as a non-roster invitee and compete for roster spot as a utility player.
The agreement, confirmed by the Braves on Thursday, allows Johnson to return to his first organization. Johnson made his major league debut as a left fielder with Atlanta in 2005. He took over as the team's starting second baseman in 2007 and remained with the Braves through the 2009 season.
Johnson played with the New York Yankees, Boston and Baltimore in 2014 and hit .215 with seven homers and 27 RBIs.
He has played second base, third base, first base and in the outfield, and he has a .250 career batting average.