Stab at fixing the client tests on travis.