The 33-year-old midfielder, a product of Atletico's youth academy, is in his second spell with his boyhood club, having returned from Real Zaragoza to help Diego Simeone's side claim the league title in 2013-14.
Griezmann leads Atletico Liga lift-off
Atletico have also reached the final of the Champions League twice in the past three years, losing on both occasions to city rivals Real Madrid.
"I am very happy to continue for one more year at home. I always say that playing with Atletico Madrid was my childhood dream, so I cannot ask for more than what I am experiencing," Gabi told the club's official website.
COMMENTS
Comments are moderated and generally will be posted if they are on-topic and not abusive.
For more information, please see our Comments FAQ