yeah, stop drinking water, if what you said about not smoking for 6 months or whatever is true, then you'll be clean even if you don't drink anything more from now til the test.