Attempt to fix Travis client errors.

DO NOT MERGE.

When done, this'll fix the client side testing for Travis CI.