Backport client test, which is touched in a backport

While attempting to backport 4d72f3689b54, this file is appears as
part of the changeset, so backport it.

The tests currently don't pass, presumbly for lack of backpatched
fixes.

Signed-off-by: Daniel Farina <daniel@fdr.io>