Unfortunately this is more brittle than I'd like to be. @mrvisser @simong : Is there something we can do here by checking the logs when Hilary has started up correctly.