Really wait until the server has started.

@pphaneuf @laiqu 
Yuck, but sure...