A clean re-write of this etcd code is needed, but until then, this should hopefully workaround the occasional test failures. In practice I don't think anyone has every hit this bug.