Tom Daley will attempt to win a 10m synchro medal at the 2016 Olympics as well as chasing individual success.
He told the BBC last year he would not compete in the event unless he believed there was a genuine chance of a medal.
Now the 21-year-old Briton will team up with Daniel Goodfellow for the British National Diving Cup this weekend.
"It's been good training with Dan and it will be exciting to get out and do synchro again," said Daley, who won an individual bronze at the 2012 Olympics.
"Dan and I know each other well and I think the partnership will work well and getting competition experience under our belts will be great."
Daley has not competed in the event since 2014, when he partnered James Denny to silver at the Commonwealth Games in Glasgow.