Roger Federer has confirmed he will grace the clay courts at the French Open and Geneva Open.

The 20-time grand slam champion made his comeback at the Qatar Open last month after a long absence following knee surgery.

Federer was beaten by Nikoloz Basilashvili at the quarter-final stage in Doha before opting against playing in Dubai and Miami.

The 39-year-old Swiss on Sunday announced he will feature on home soil in a Geneva Open event that gets under way on May 16.

World number seven Federer will also be in the draw for the second grand slam of the year at Roland Garros, where he reached the semi-final two years ago in his first appearance at the Paris major since 2015.

He tweeted: "Hi everyone! Happy to let you know that I will play Geneva and Paris.

"Until then, I will use the time to train. Can't wait to play in Switzerland again."

Rafael Nadal will be a strong favourite to surpass Federer's tally of grand slam titles in Paris, where he has won the French Open a record 13 times.

The French Open will take place a week later than initially scheduled this year, a move aimed at increasing the possibility of spectators attending the event in Paris.

Action at Roland Garros was due to begin with qualifying on May 17, reverting back to a more traditional time in the tennis calendar after taking place last year in September and October.

That move was made due to the impact of the coronavirus pandemic, taking place after the US Open while Wimbledon was cancelled.

With France currently in a third nationwide lockdown as part of measures to slow the rise in COVID-19 cases, the ATP and WTA Tours released a joint statement on Thursday confirming the main draw at Roland Garros will now begin on May 30 instead.

"Tennis has required an agile approach to the calendar over the past 12 months in order to manage the challenges of the pandemic, and this continues to be the case," the statement read.

"The decision to delay the start of Roland Garros by one week has been made in the context of recently heightened COVID-19 restrictions in France, with the additional time improving the likelihood of enhanced conditions and ability to welcome fans at the event.

"Both the ATP and WTA are working in consultation with all parties impacted by the postponement to optimise the calendar for players, tournaments and fans, in the lead-up to and following Roland Garros.

"Further updates will be communicated in due course."

Rafael Nadal is the defending men's champion, the Spaniard having secured the clay-court title for a 13th time in 2020. However, there was a new winner in the women's tournament, Iga Swiatek of Poland defeating Sofia Kenin in the final.

A statement released from the Grand Slam Board backed the move to postpone the French Open, while also announcing the grass-court season will be reduced by one week as a consequence.

"All four grand slam tournaments are united in their view on the importance of a meaningful build-up to every grand slam, to provide players of all competitive levels with appropriate opportunities to practice, prepare and compete on the relevant surface," a statement released via Wimbledon's official website read.

"It was for this reason that the grand slams, together with the Tours, were supportive of changes to the calendar to create an enhanced grass-court season of three weeks between Roland Garros and the Championships from 2015 onwards. It is widely agreed that this change has been very successfully received.

"However, given the considerable challenges ahead of the FFT in staging Roland Garros, and to avoid further impact on the rest of the calendar, the grass-court season will be reduced by one week in 2021."

Wimbledon will remain as planned, the main draw beginning on June 28 with qualifying taking place the week beforehand.

Next month's French Open could be postponed amid the ongoing coronavirus pandemic, according to France's minister of sports.

France entered its third national lockdown on Saturday in a bid to halt another surge of COVID-19 cases, which had threatened to overwhelm hospitals across the country. 

Professional sporting events are largely exempt from the restrictions, but minister of sports Roxana Maracineanu has suggested the French Open could be put back from its scheduled May 23 start date.

"We are in discussions with them [the French Tennis Federation] to see if we should change the date to coincide with a possible resumption of all sports and major events," she told radio station France Info.

"Today, although high-level sport has been preserved, we try to limit the risks of clusters, of spreading the virus within professional sports."

Rafael Nadal won last year's French Open, which was postponed by four months, to pull level with Roger Federer's record of 20 grand slam titles.