American Andre Agassi, eight-times grand slam champion, will continue to coach Djokovic at the grand slams with 39-year-old Stepanek stepping in at other tournaments.