I started drinking more water when I got a sport bottle with one of them built-in sipping straws. It's just near me most of the time, so I take some sips just to occupy myself for a few seconds.

Previously I drank a lot of tea, wherein the sign that I need to get more tea was when the cup was empty. But I'm off caffeine now.