diff --git a/command/flags/http.go b/command/flags/http.go
index 1fa78e1671..591567a4f0 100644
--- a/command/flags/http.go
+++ b/command/flags/http.go
@@ -87,6 +87,12 @@ func (f *HTTPFlags) Token() string {
 func (f *HTTPFlags) APIClient() (*api.Client, error) {
 	c := api.DefaultConfig()
 
+	f.MergeOntoConfig(c)
+
+	return api.NewClient(c)
+}
+
+func (f *HTTPFlags) MergeOntoConfig(c *api.Config) {
 	f.address.Merge(&c.Address)
 	f.token.Merge(&c.Token)
 	f.caFile.Merge(&c.TLSConfig.CAFile)
@@ -95,6 +101,4 @@ func (f *HTTPFlags) APIClient() (*api.Client, error) {
 	f.keyFile.Merge(&c.TLSConfig.KeyFile)
 	f.tlsServerName.Merge(&c.TLSConfig.Address)
 	f.datacenter.Merge(&c.Datacenter)
-
-	return api.NewClient(c)
 }