What does it take to come up diluted?

I will keep it short and sweet. Took a drug screen last Wednesday (1.16) @ 10:30am. I have no worries that I didn't pass, been clean for over 60 days. However I am wondering what it takes for a sample to come up diluted. I didn't drink hardly anything the night before. From 8:00am until the test at 10:30am I drank about 40oz of Gatorade. Would this be enough to make a sample diluted? I have issues "going" in public so I wanted to make sure I could go. The void was very light in color, but still had a yellow tint to it. How long should I wait before I start smoking again to make sure the sample didn't come up diluted and they want another sample? Thanks.

Natural piss color for a healthy hydrated individual should be a light yellow color.
That's the way my piss is for the most part.

I wouldn't smoke until you know for sure, but if you're not willing to wait that much; at least try a week.