I think you should tell him relatively soon, when you feel like it's the most comfortable time. Just be honest if he asks you something.