Alberto Contador has confirmed he will end his career with Tinkoff-Saxo after agreeing a one-year contract extension until 2016.
The Spaniard, 32, hinted earlier in the season that he would only ride for two more years and suggested he might have to leave Tinkoff-Saxo when his existing deal expired in 2015.
However, he has now committed to see out his career with the Russian team and is hoping to add more grand tour wins to his current six before leaving the sport.
Contador said: "I am very happy to have closed the deal. For me it was something very important. I knew I could not wait much more because if I had to choose another option it should have been done much in advance, in order to adequately prepare the team.
"We have been thoroughly assessing all aspects and in Tinkoff-Saxo we have a group that can fully guarantee the challenge of the Grand Tours."
Contador joined the team currently known as Tinkoff-Saxo in 2011 and is attempting to win both the Giro d'Italia and Tour de France this year.
Tinkoff-Saxo owner Oleg Tinkov said: "I'm very happy that Alberto will lead Tinkoff-Saxo in 2016 as well, because I truly believe he is the best cyclist in the world and I am convinced he will continue to be so for a few more years.
"Unfortunately, he decided he would retire at the end of next year, which means he will race with my team for two full seasons. I would have, obviously, preferred him to stay longer but that was his personal decision."