diff --git a/client/changes.go b/client/changes.go
index 47fdfd84f..5f096b031 100644
--- a/client/changes.go
+++ b/client/changes.go
@@ -89,7 +89,7 @@ type changeAndData struct {
 // Change fetches information about a Change given its ID.
 func (client *Client) Change(id string) (*Change, error) {
 	var chgd changeAndData
-	_, err := client.doSync("GET", "/v1/changes/"+id, nil, nil, nil, &chgd)
+	_, err := client.DoSync("GET", "/v1/changes/"+id, nil, nil, nil, &chgd)
 	if err != nil {
 		return nil, err
 	}
@@ -111,7 +111,7 @@ func (client *Client) Abort(id string) (*Change, error) {
 	}
 
 	var chg Change
-	if _, err := client.doSync("POST", "/v1/changes/"+id, nil, nil, &body, &chg); err != nil {
+	if _, err := client.DoSync("POST", "/v1/changes/"+id, nil, nil, &body, &chg); err != nil {
 		return nil, err
 	}
 
@@ -158,7 +158,7 @@ func (client *Client) Changes(opts *ChangesOptions) ([]*Change, error) {
 	}
 
 	var chgds []changeAndData
-	_, err := client.doSync("GET", "/v1/changes", query, nil, nil, &chgds)
+	_, err := client.DoSync("GET", "/v1/changes", query, nil, nil, &chgds)
 	if err != nil {
 		return nil, err
 	}
@@ -190,7 +190,7 @@ func (client *Client) WaitChange(id string, opts *WaitChangeOptions) (*Change, e
 		query.Set("timeout", opts.Timeout.String())
 	}
 
-	_, err := client.doSync("GET", "/v1/changes/"+id+"/wait", query, nil, nil, &chgd)
+	_, err := client.DoSync("GET", "/v1/changes/"+id+"/wait", query, nil, nil, &chgd)
 	if err != nil {
 		return nil, err
 	}
diff --git a/client/checks.go b/client/checks.go
index b86d656be..31ede6246 100644
--- a/client/checks.go
+++ b/client/checks.go
@@ -79,7 +79,7 @@ func (client *Client) Checks(opts *ChecksOptions) ([]*CheckInfo, error) {
 		query["names"] = opts.Names
 	}
 	var checks []*CheckInfo
-	_, err := client.doSync("GET", "/v1/checks", query, nil, nil, &checks)
+	_, err := client.DoSync("GET", "/v1/checks", query, nil, nil, &checks)
 	if err != nil {
 		return nil, err
 	}
diff --git a/client/client.go b/client/client.go
index 0e9cce91a..27fccb5bb 100644
--- a/client/client.go
+++ b/client/client.go
@@ -87,6 +87,11 @@ type doer interface {
 	Do(*http.Request) (*http.Response, error)
 }
 
+type ClientGetter interface {
+	// GetClient obtains a Pebble Client struct.
+	Client() *Client
+}
+
 // Config allows the user to customize client behavior.
 type Config struct {
 	// BaseURL contains the base URL where the Pebble daemon is expected to be.
@@ -118,6 +123,10 @@ type Client struct {
 	getWebsocket getWebsocketFunc
 }
 
+func (c *Client) Client() *Client {
+	return c
+}
+
 type getWebsocketFunc func(url string) (clientWebsocket, error)
 
 type clientWebsocket interface {
@@ -326,11 +335,11 @@ func decodeInto(reader io.Reader, v interface{}) error {
 	return nil
 }
 
-// doSync performs a request to the given path using the specified HTTP method.
+// DoSync performs a request to the given path using the specified HTTP method.
 // It expects a "sync" response from the API and on success decodes the JSON
 // response payload into the given value using the "UseNumber" json decoding
 // which produces json.Numbers instead of float64 types for numbers.
-func (client *Client) doSync(method, path string, query url.Values, headers map[string]string, body io.Reader, v interface{}) (*ResultInfo, error) {
+func (client *Client) DoSync(method, path string, query url.Values, headers map[string]string, body io.Reader, v interface{}) (*ResultInfo, error) {
 	var rsp response
 	if err := client.do(method, path, query, headers, body, &rsp); err != nil {
 		return nil, err
@@ -476,7 +485,7 @@ type SysInfo struct {
 func (client *Client) SysInfo() (*SysInfo, error) {
 	var sysInfo SysInfo
 
-	if _, err := client.doSync("GET", "/v1/system-info", nil, nil, nil, &sysInfo); err != nil {
+	if _, err := client.DoSync("GET", "/v1/system-info", nil, nil, nil, &sysInfo); err != nil {
 		return nil, fmt.Errorf("cannot obtain system details: %w", err)
 	}
 
@@ -498,7 +507,7 @@ func (client *Client) DebugPost(action string, params interface{}, result interf
 		return err
 	}
 
-	_, err = client.doSync("POST", "/v1/debug", nil, nil, bytes.NewReader(body), result)
+	_, err = client.DoSync("POST", "/v1/debug", nil, nil, bytes.NewReader(body), result)
 	return err
 }
 
@@ -508,6 +517,6 @@ func (client *Client) DebugGet(action string, result interface{}, params map[str
 	for k, v := range params {
 		urlParams.Set(k, v)
 	}
-	_, err := client.doSync("GET", "/v1/debug", urlParams, nil, nil, &result)
+	_, err := client.DoSync("GET", "/v1/debug", urlParams, nil, nil, &result)
 	return err
 }
diff --git a/client/files.go b/client/files.go
index cce33414d..8d8794ca5 100644
--- a/client/files.go
+++ b/client/files.go
@@ -121,7 +121,7 @@ func (client *Client) ListFiles(opts *ListFilesOptions) ([]*FileInfo, error) {
 	}
 
 	var results []fileInfoResult
-	_, err := client.doSync("GET", "/v1/files", q, nil, nil, &results)
+	_, err := client.DoSync("GET", "/v1/files", q, nil, nil, &results)
 	if err != nil {
 		return nil, err
 	}
@@ -280,7 +280,7 @@ func (client *Client) MakeDir(opts *MakeDirOptions) error {
 	headers := map[string]string{
 		"Content-Type": "application/json",
 	}
-	if _, err := client.doSync("POST", "/v1/files", nil, headers, &body, &result); err != nil {
+	if _, err := client.DoSync("POST", "/v1/files", nil, headers, &body, &result); err != nil {
 		return err
 	}
 
@@ -347,7 +347,7 @@ func (client *Client) RemovePath(opts *RemovePathOptions) error {
 	headers := map[string]string{
 		"Content-Type": "application/json",
 	}
-	if _, err := client.doSync("POST", "/v1/files", nil, headers, &body, &result); err != nil {
+	if _, err := client.DoSync("POST", "/v1/files", nil, headers, &body, &result); err != nil {
 		return err
 	}
 
diff --git a/client/plan.go b/client/plan.go
index 25b447f08..a8d286c1e 100644
--- a/client/plan.go
+++ b/client/plan.go
@@ -52,7 +52,7 @@ func (client *Client) AddLayer(opts *AddLayerOptions) error {
 	if err := json.NewEncoder(&body).Encode(&payload); err != nil {
 		return err
 	}
-	_, err := client.doSync("POST", "/v1/layers", nil, nil, &body, nil)
+	_, err := client.DoSync("POST", "/v1/layers", nil, nil, &body, nil)
 	return err
 }
 
@@ -64,7 +64,7 @@ func (client *Client) PlanBytes(_ *PlanOptions) (data []byte, err error) {
 		"format": []string{"yaml"},
 	}
 	var dataStr string
-	_, err = client.doSync("GET", "/v1/plan", query, nil, nil, &dataStr)
+	_, err = client.DoSync("GET", "/v1/plan", query, nil, nil, &dataStr)
 	if err != nil {
 		return nil, err
 	}
diff --git a/client/services.go b/client/services.go
index 0be19d23e..8161f4a23 100644
--- a/client/services.go
+++ b/client/services.go
@@ -119,7 +119,7 @@ func (client *Client) Services(opts *ServicesOptions) ([]*ServiceInfo, error) {
 		"names": []string{strings.Join(opts.Names, ",")},
 	}
 	var services []*ServiceInfo
-	_, err := client.doSync("GET", "/v1/services", query, nil, nil, &services)
+	_, err := client.DoSync("GET", "/v1/services", query, nil, nil, &services)
 	if err != nil {
 		return nil, err
 	}
diff --git a/client/signals.go b/client/signals.go
index 9452ad4f8..2c78a92c2 100644
--- a/client/signals.go
+++ b/client/signals.go
@@ -36,7 +36,7 @@ func (client *Client) SendSignal(opts *SendSignalOptions) error {
 	if err != nil {
 		return fmt.Errorf("cannot encode JSON payload: %w", err)
 	}
-	_, err = client.doSync("POST", "/v1/signals", nil, nil, &body, nil)
+	_, err = client.DoSync("POST", "/v1/signals", nil, nil, &body, nil)
 	return err
 }
 
diff --git a/client/warnings.go b/client/warnings.go
index d63da1238..9f30b8a5a 100644
--- a/client/warnings.go
+++ b/client/warnings.go
@@ -52,7 +52,7 @@ func (client *Client) Warnings(opts WarningsOptions) ([]*Warning, error) {
 	if opts.All {
 		q.Add("select", "all")
 	}
-	_, err := client.doSync("GET", "/v1/warnings", q, nil, nil, &jws)
+	_, err := client.DoSync("GET", "/v1/warnings", q, nil, nil, &jws)
 
 	ws := make([]*Warning, len(jws))
 	for i, jw := range jws {
@@ -77,6 +77,6 @@ func (client *Client) Okay(t time.Time) error {
 	if err := json.NewEncoder(&body).Encode(op); err != nil {
 		return err
 	}
-	_, err := client.doSync("POST", "/v1/warnings", nil, nil, &body, nil)
+	_, err := client.DoSync("POST", "/v1/warnings", nil, nil, &body, nil)
 	return err
 }
diff --git a/internals/cli/cli.go b/internals/cli/cli.go
index e35a2baa4..d98ebf508 100644
--- a/internals/cli/cli.go
+++ b/internals/cli/cli.go
@@ -141,15 +141,15 @@ func fixupArg(optName string) string {
 }
 
 type clientSetter interface {
-	setClient(*client.Client)
+	setClient(client.ClientGetter)
 }
 
-type clientMixin struct {
-	client *client.Client
+type ClientMixin struct {
+	client.ClientGetter
 }
 
-func (ch *clientMixin) setClient(cli *client.Client) {
-	ch.client = cli
+func (ch *ClientMixin) setClient(cg client.ClientGetter) {
+	ch.ClientGetter = cg
 }
 
 type parserSetter interface {
@@ -163,11 +163,11 @@ type defaultOptions struct {
 // Parser creates and populates a fresh parser.
 // Since commands have local state a fresh parser is required to isolate tests
 // from each other.
-func Parser(cli *client.Client) *flags.Parser {
+func Parser(cg client.ClientGetter) *flags.Parser {
 	// Implement --version by default on every command
 	defaultOpts := defaultOptions{
 		Version: func() {
-			printVersions(cli)
+			printVersions(cg.Client())
 			panic(&exitStatus{0})
 		},
 	}
@@ -195,7 +195,7 @@ func Parser(cli *client.Client) *flags.Parser {
 	for _, c := range commands {
 		obj := c.Builder()
 		if x, ok := obj.(clientSetter); ok {
-			x.setClient(cli)
+			x.setClient(cg)
 		}
 		if x, ok := obj.(parserSetter); ok {
 			x.setParser(parser)
@@ -276,7 +276,7 @@ func (e *exitStatus) Error() string {
 	return fmt.Sprintf("internal error: exitStatus{%d} being handled as normal error", e.code)
 }
 
-func Run() error {
+func RunWithClient(cg client.ClientGetter) error {
 	defer func() {
 		if v := recover(); v != nil {
 			if e, ok := v.(*exitStatus); ok {
@@ -288,14 +288,7 @@ func Run() error {
 
 	logger.SetLogger(logger.New(os.Stderr, "[pebble] "))
 
-	_, clientConfig.Socket = getEnvPaths()
-
-	cli, err := client.New(&clientConfig)
-	if err != nil {
-		return fmt.Errorf("cannot create client: %v", err)
-	}
-
-	parser := Parser(cli)
+	parser := Parser(cg)
 	xtra, err := parser.Parse()
 	if err != nil {
 		if e, ok := err.(*flags.Error); ok {
@@ -328,8 +321,19 @@ func Run() error {
 		return nil
 	}
 
-	maybePresentWarnings(cli.WarningsSummary())
+	return nil
+}
 
+func Run() error {
+	_, clientConfig.Socket = getEnvPaths()
+	cli, err := client.New(&clientConfig)
+	if err != nil {
+		return fmt.Errorf("cannot create client: %v", err)
+	}
+	if err := RunWithClient(cli); err != nil {
+		return err
+	}
+	maybePresentWarnings(cli.WarningsSummary())
 	return nil
 }
 
diff --git a/internals/cli/cmd_add.go b/internals/cli/cmd_add.go
index 88c01c127..b40be8a42 100644
--- a/internals/cli/cmd_add.go
+++ b/internals/cli/cmd_add.go
@@ -31,7 +31,7 @@ label (or append if the label is not found).
 `
 
 type cmdAdd struct {
-	clientMixin
+	ClientMixin
 	Combine    bool `long:"combine"`
 	Positional struct {
 		Label     string `positional-arg-name:"<label>" required:"1"`
@@ -64,7 +64,7 @@ func (cmd *cmdAdd) Execute(args []string) error {
 		Label:     cmd.Positional.Label,
 		LayerData: data,
 	}
-	err = cmd.client.AddLayer(&opts)
+	err = cmd.Client().AddLayer(&opts)
 	if err != nil {
 		return err
 	}
diff --git a/internals/cli/cmd_autostart.go b/internals/cli/cmd_autostart.go
index 251c64fc7..58aa2381a 100644
--- a/internals/cli/cmd_autostart.go
+++ b/internals/cli/cmd_autostart.go
@@ -46,7 +46,7 @@ func (cmd cmdAutoStart) Execute(args []string) error {
 	}
 
 	servopts := client.ServiceOptions{}
-	changeID, err := cmd.client.AutoStart(&servopts)
+	changeID, err := cmd.Client().AutoStart(&servopts)
 	if err != nil {
 		return err
 	}
diff --git a/internals/cli/cmd_changes.go b/internals/cli/cmd_changes.go
index 0e5fa9356..f48171850 100644
--- a/internals/cli/cmd_changes.go
+++ b/internals/cli/cmd_changes.go
@@ -30,7 +30,7 @@ The changes command displays a summary of system changes performed recently.
 `
 
 type cmdChanges struct {
-	clientMixin
+	ClientMixin
 	timeMixin
 	Positional struct {
 		Service string `positional-arg-name:"<service>"`
@@ -103,7 +103,7 @@ func (c *cmdChanges) Execute(args []string) error {
 		Selector:    client.ChangesAll,
 	}
 
-	changes, err := queryChanges(c.client, &opts)
+	changes, err := queryChanges(c.Client(), &opts)
 	if err != nil {
 		return err
 	}
@@ -156,7 +156,7 @@ func queryChange(cli *client.Client, chid string) (*client.Change, error) {
 }
 
 func (c *cmdTasks) showChange(chid string) error {
-	chg, err := queryChange(c.client, chid)
+	chg, err := queryChange(c.Client(), chid)
 	if err != nil {
 		return err
 	}
diff --git a/internals/cli/cmd_checks.go b/internals/cli/cmd_checks.go
index 9d95c15a9..dfd20b7de 100644
--- a/internals/cli/cmd_checks.go
+++ b/internals/cli/cmd_checks.go
@@ -29,7 +29,7 @@ arguments.
 `
 
 type cmdChecks struct {
-	clientMixin
+	ClientMixin
 	Level      string `long:"level"`
 	Positional struct {
 		Checks []string `positional-arg-name:"<check>"`
@@ -57,7 +57,7 @@ func (cmd *cmdChecks) Execute(args []string) error {
 		Level: client.CheckLevel(cmd.Level),
 		Names: cmd.Positional.Checks,
 	}
-	checks, err := cmd.client.Checks(&opts)
+	checks, err := cmd.Client().Checks(&opts)
 	if err != nil {
 		return err
 	}
diff --git a/internals/cli/cmd_enter.go b/internals/cli/cmd_enter.go
index 6e4e6ccb9..ca032dff7 100644
--- a/internals/cli/cmd_enter.go
+++ b/internals/cli/cmd_enter.go
@@ -46,7 +46,7 @@ These subcommands are currently supported:
 `
 
 type cmdEnter struct {
-	clientMixin
+	ClientMixin
 	sharedRunEnterOpts
 	Run        bool `long:"run"`
 	Positional struct {
@@ -105,7 +105,7 @@ func (cmd *cmdEnter) Execute(args []string) error {
 	runCmd := cmdRun{
 		sharedRunEnterOpts: cmd.sharedRunEnterOpts,
 	}
-	runCmd.setClient(cmd.client)
+	runCmd.setClient(cmd.Client())
 
 	if len(cmd.Positional.Cmd) == 0 {
 		runCmd.run(nil)
@@ -119,7 +119,7 @@ func (cmd *cmdEnter) Execute(args []string) error {
 		extraArgs []string
 	)
 
-	parser := Parser(cmd.client)
+	parser := Parser(cmd.Client())
 	parser.CommandHandler = func(c flags.Commander, a []string) error {
 		commander = c
 		extraArgs = a
diff --git a/internals/cli/cmd_exec.go b/internals/cli/cmd_exec.go
index 07a947f4a..da9a10f3b 100644
--- a/internals/cli/cmd_exec.go
+++ b/internals/cli/cmd_exec.go
@@ -43,7 +43,7 @@ pebble exec --timeout 10s -- echo -n foo bar
 `
 
 type cmdExec struct {
-	clientMixin
+	ClientMixin
 	WorkingDir     string        `short:"w"`
 	Env            []string      `long:"env"`
 	UserID         *int          `long:"uid"`
@@ -180,7 +180,7 @@ func (cmd *cmdExec) Execute(args []string) error {
 	}
 
 	// Start the command.
-	process, err := cmd.client.Exec(opts)
+	process, err := cmd.Client().Exec(opts)
 	if err != nil {
 		return err
 	}
diff --git a/internals/cli/cmd_logs.go b/internals/cli/cmd_logs.go
index 4faf1bb58..1d97b8bb4 100644
--- a/internals/cli/cmd_logs.go
+++ b/internals/cli/cmd_logs.go
@@ -33,7 +33,7 @@ if none are specified) and displays them in chronological order.
 `
 
 type cmdLogs struct {
-	clientMixin
+	ClientMixin
 	Follow     bool   `short:"f" long:"follow"`
 	Format     string `long:"format"`
 	N          string `short:"n"`
@@ -104,9 +104,9 @@ func (cmd *cmdLogs) Execute(args []string) error {
 	if cmd.Follow {
 		// Stop following when Ctrl-C pressed (SIGINT).
 		ctx := notifyContext(context.Background(), os.Interrupt)
-		err = cmd.client.FollowLogs(ctx, &opts)
+		err = cmd.Client().FollowLogs(ctx, &opts)
 	} else {
-		err = cmd.client.Logs(&opts)
+		err = cmd.Client().Logs(&opts)
 	}
 	return err
 }
diff --git a/internals/cli/cmd_ls.go b/internals/cli/cmd_ls.go
index 8cd31f9e3..0c844dd3d 100644
--- a/internals/cli/cmd_ls.go
+++ b/internals/cli/cmd_ls.go
@@ -33,7 +33,7 @@ may be specified for the last path element.
 `
 
 type cmdLs struct {
-	clientMixin
+	ClientMixin
 	timeMixin
 
 	Directory  bool `short:"d"`
@@ -67,7 +67,7 @@ func (cmd *cmdLs) Execute(args []string) error {
 		return err
 	}
 
-	files, err := cmd.client.ListFiles(&client.ListFilesOptions{
+	files, err := cmd.Client().ListFiles(&client.ListFilesOptions{
 		Path:    path,
 		Pattern: pattern,
 		Itself:  cmd.Directory,
diff --git a/internals/cli/cmd_mkdir.go b/internals/cli/cmd_mkdir.go
index 4e95edafc..ae506a4ad 100644
--- a/internals/cli/cmd_mkdir.go
+++ b/internals/cli/cmd_mkdir.go
@@ -30,7 +30,7 @@ The mkdir command creates the specified directory.
 `
 
 type cmdMkdir struct {
-	clientMixin
+	ClientMixin
 
 	MakeParents bool   `short:"p"`
 	Permissions string `short:"m"`
@@ -83,5 +83,5 @@ func (cmd *cmdMkdir) Execute(args []string) error {
 		opts.Permissions = os.FileMode(p)
 	}
 
-	return cmd.client.MakeDir(&opts)
+	return cmd.Client().MakeDir(&opts)
 }
diff --git a/internals/cli/cmd_plan.go b/internals/cli/cmd_plan.go
index 0e82796cf..8c7e8f78c 100644
--- a/internals/cli/cmd_plan.go
+++ b/internals/cli/cmd_plan.go
@@ -27,7 +27,7 @@ format. Layers are combined according to the override rules defined in them.
 `
 
 type cmdPlan struct {
-	clientMixin
+	ClientMixin
 }
 
 func init() {
@@ -43,7 +43,7 @@ func (cmd *cmdPlan) Execute(args []string) error {
 	if len(args) > 0 {
 		return ErrExtraArgs
 	}
-	planYAML, err := cmd.client.PlanBytes(&client.PlanOptions{})
+	planYAML, err := cmd.Client().PlanBytes(&client.PlanOptions{})
 	if err != nil {
 		return err
 	}
diff --git a/internals/cli/cmd_replan.go b/internals/cli/cmd_replan.go
index b4b92ad9f..18a1489f0 100644
--- a/internals/cli/cmd_replan.go
+++ b/internals/cli/cmd_replan.go
@@ -47,7 +47,7 @@ func (cmd cmdReplan) Execute(args []string) error {
 	}
 
 	servopts := client.ServiceOptions{}
-	changeID, err := cmd.client.Replan(&servopts)
+	changeID, err := cmd.Client().Replan(&servopts)
 	if err != nil {
 		return err
 	}
diff --git a/internals/cli/cmd_restart.go b/internals/cli/cmd_restart.go
index 70d00e9d7..debefd3ce 100644
--- a/internals/cli/cmd_restart.go
+++ b/internals/cli/cmd_restart.go
@@ -49,7 +49,7 @@ func (cmd cmdRestart) Execute(args []string) error {
 	servopts := client.ServiceOptions{
 		Names: cmd.Positional.Services,
 	}
-	changeID, err := cmd.client.Restart(&servopts)
+	changeID, err := cmd.Client().Restart(&servopts)
 	if err != nil {
 		return err
 	}
diff --git a/internals/cli/cmd_rm.go b/internals/cli/cmd_rm.go
index e5a4265fc..cbac6b1e3 100644
--- a/internals/cli/cmd_rm.go
+++ b/internals/cli/cmd_rm.go
@@ -25,7 +25,7 @@ The rm command removes a file or directory.
 `
 
 type cmdRm struct {
-	clientMixin
+	ClientMixin
 	Recursive  bool `short:"r"`
 	Positional struct {
 		Path string `positional-arg-name:"<path>"`
@@ -49,7 +49,7 @@ func (cmd *cmdRm) Execute(args []string) error {
 		return ErrExtraArgs
 	}
 
-	return cmd.client.RemovePath(&client.RemovePathOptions{
+	return cmd.Client().RemovePath(&client.RemovePathOptions{
 		Path:      cmd.Positional.Path,
 		Recursive: cmd.Recursive,
 	})
diff --git a/internals/cli/cmd_run.go b/internals/cli/cmd_run.go
index c0519c22a..d64af2a3b 100644
--- a/internals/cli/cmd_run.go
+++ b/internals/cli/cmd_run.go
@@ -60,7 +60,7 @@ var sharedRunEnterArgsHelp = map[string]string{
 }
 
 type cmdRun struct {
-	clientMixin
+	ClientMixin
 	sharedRunEnterOpts
 }
 
@@ -201,7 +201,7 @@ func runDaemon(rcmd *cmdRun, ch chan os.Signal, ready chan<- func()) error {
 
 	if !rcmd.Hold {
 		servopts := client.ServiceOptions{}
-		changeID, err := rcmd.client.AutoStart(&servopts)
+		changeID, err := rcmd.Client().AutoStart(&servopts)
 		if err != nil {
 			logger.Noticef("Cannot start default services: %v", err)
 		} else {
@@ -237,7 +237,7 @@ out:
 	}
 
 	// Close our own self-connection, otherwise it prevents fast and clean termination.
-	rcmd.client.CloseIdleConnections()
+	rcmd.Client().CloseIdleConnections()
 
 	return d.Stop(ch)
 }
diff --git a/internals/cli/cmd_services.go b/internals/cli/cmd_services.go
index 933ab3713..8d9925cdd 100644
--- a/internals/cli/cmd_services.go
+++ b/internals/cli/cmd_services.go
@@ -28,7 +28,7 @@ about all services if none are specified.
 `
 
 type cmdServices struct {
-	clientMixin
+	ClientMixin
 	timeMixin
 	Positional struct {
 		Services []string `positional-arg-name:"<service>"`
@@ -53,7 +53,7 @@ func (cmd *cmdServices) Execute(args []string) error {
 	opts := client.ServicesOptions{
 		Names: cmd.Positional.Services,
 	}
-	services, err := cmd.client.Services(&opts)
+	services, err := cmd.Client().Services(&opts)
 	if err != nil {
 		return err
 	}
diff --git a/internals/cli/cmd_signal.go b/internals/cli/cmd_signal.go
index 5e1ffb700..b115a9ec4 100644
--- a/internals/cli/cmd_signal.go
+++ b/internals/cli/cmd_signal.go
@@ -31,7 +31,7 @@ pebble signal HUP mysql nginx
 `
 
 type cmdSignal struct {
-	clientMixin
+	ClientMixin
 	Positional struct {
 		Signal   string   `positional-arg-name:"<SIGNAL>"`
 		Services []string `positional-arg-name:"<service>"`
@@ -58,7 +58,7 @@ func (cmd *cmdSignal) Execute(args []string) error {
 		Signal:   cmd.Positional.Signal,
 		Services: cmd.Positional.Services,
 	}
-	err := cmd.client.SendSignal(&opts)
+	err := cmd.Client().SendSignal(&opts)
 	if err != nil {
 		return err
 	}
diff --git a/internals/cli/cmd_start.go b/internals/cli/cmd_start.go
index 9167ff2c2..37389f6f2 100644
--- a/internals/cli/cmd_start.go
+++ b/internals/cli/cmd_start.go
@@ -51,7 +51,7 @@ func (cmd cmdStart) Execute(args []string) error {
 	servopts := client.ServiceOptions{
 		Names: cmd.Positional.Services,
 	}
-	changeID, err := cmd.client.Start(&servopts)
+	changeID, err := cmd.Client().Start(&servopts)
 	if err != nil {
 		return err
 	}
diff --git a/internals/cli/cmd_stop.go b/internals/cli/cmd_stop.go
index 671dbff26..28af449f2 100644
--- a/internals/cli/cmd_stop.go
+++ b/internals/cli/cmd_stop.go
@@ -51,7 +51,7 @@ func (cmd cmdStop) Execute(args []string) error {
 	servopts := client.ServiceOptions{
 		Names: cmd.Positional.Services,
 	}
-	changeID, err := cmd.client.Stop(&servopts)
+	changeID, err := cmd.Client().Stop(&servopts)
 	if err != nil {
 		return err
 	}
diff --git a/internals/cli/cmd_version.go b/internals/cli/cmd_version.go
index f8a60042d..6d05cdc1e 100644
--- a/internals/cli/cmd_version.go
+++ b/internals/cli/cmd_version.go
@@ -29,7 +29,7 @@ The version command displays the versions of the running client and server.
 `
 
 type cmdVersion struct {
-	clientMixin
+	ClientMixin
 	ClientOnly bool `long:"client"`
 }
 
@@ -55,7 +55,7 @@ func (cmd cmdVersion) Execute(args []string) error {
 		return nil
 	}
 
-	return printVersions(cmd.client)
+	return printVersions(cmd.Client())
 }
 
 func printVersions(cli *client.Client) error {
diff --git a/internals/cli/cmd_warnings.go b/internals/cli/cmd_warnings.go
index 24db9ec18..170e4c51a 100644
--- a/internals/cli/cmd_warnings.go
+++ b/internals/cli/cmd_warnings.go
@@ -43,7 +43,7 @@ Warnings expire automatically, and once expired they are forgotten.
 `
 
 type cmdWarnings struct {
-	clientMixin
+	ClientMixin
 	timeMixin
 	unicodeMixin
 	All     bool `long:"all"`
@@ -58,7 +58,7 @@ Once acknowledged, a warning won't appear again unless it reoccurs and
 sufficient time has passed.
 `
 
-type cmdOkay struct{ clientMixin }
+type cmdOkay struct{ ClientMixin }
 
 func init() {
 	AddCommand(&CmdInfo{
@@ -85,7 +85,7 @@ func (cmd *cmdWarnings) Execute(args []string) error {
 	}
 	now := time.Now()
 
-	warnings, err := cmd.client.Warnings(client.WarningsOptions{All: cmd.All})
+	warnings, err := cmd.Client().Warnings(client.WarningsOptions{All: cmd.All})
 	if err != nil {
 		return err
 	}
@@ -164,7 +164,7 @@ func (cmd *cmdOkay) Execute(args []string) error {
 		return err
 	}
 
-	return cmd.client.Okay(last)
+	return cmd.Client().Okay(last)
 }
 
 const warnFileEnvKey = "PEBBLE_LAST_WARNING_TIMESTAMP_FILENAME"
diff --git a/internals/cli/last.go b/internals/cli/last.go
index deafc9a31..77737d686 100644
--- a/internals/cli/last.go
+++ b/internals/cli/last.go
@@ -22,7 +22,7 @@ import (
 )
 
 type changeIDMixin struct {
-	clientMixin
+	ClientMixin
 	LastChangeType string `long:"last"`
 	Positional     struct {
 		ChangeID string `positional-arg-name:"<change-id>"`
@@ -50,7 +50,7 @@ func (l *changeIDMixin) GetChangeID() (string, error) {
 		return string(l.Positional.ChangeID), nil
 	}
 
-	cli := l.client
+	cli := l.Client()
 	// note that at this point we know l.LastChangeType != ""
 	kind := l.LastChangeType
 	optional := false
diff --git a/internals/cli/wait.go b/internals/cli/wait.go
index 750bfce39..3cb2add44 100644
--- a/internals/cli/wait.go
+++ b/internals/cli/wait.go
@@ -31,7 +31,7 @@ var (
 )
 
 type waitMixin struct {
-	clientMixin
+	ClientMixin
 	NoWait    bool `long:"no-wait"`
 	skipAbort bool
 }
@@ -47,7 +47,7 @@ func (wmx waitMixin) wait(id string) (*client.Change, error) {
 		fmt.Fprintf(Stdout, "%s\n", id)
 		return nil, noWait
 	}
-	cli := wmx.client
+	cli := wmx.Client()
 
 	// Intercept sigint
 	sigs := make(chan os.Signal, 2)
@@ -58,7 +58,7 @@ func (wmx waitMixin) wait(id string) (*client.Change, error) {
 		if sig == nil || wmx.skipAbort {
 			return
 		}
-		_, err := wmx.client.Abort(id)
+		_, err := wmx.Client().Abort(id)
 		if err != nil {
 			fmt.Fprintf(Stderr, err.Error()+"\n")
 		}