World No 1 Novak Djokovic was made to work hard at the French Open before emerging victorious 6-3 7-6 (7-5) 7-5 over dogged German Tommy Haas.